Commit 0ce9f6de authored by Jan Djärv's avatar Jan Djärv
Browse files

* nsfont.m (INVALID_GLYPH): New define.

(nsfont_encode_char): Use INVALID_GLYPH.
(ns_uni_to_glyphs): Ditto, check for NSNullGlyph.

Fixes: debbugs:15138
parent 88527bc0
2013-09-03 Jan Djärv <jan.h.d@swipnet.se>
* nsfont.m (INVALID_GLYPH): New define.
(nsfont_encode_char): Use INVALID_GLYPH.
(ns_uni_to_glyphs): Ditto, check for NSNullGlyph (Bug#15138).
2013-09-02 Dmitry Antipov <dmantipov@yandex.ru>
* xterm.c (x_last_mouse_movement_time): Revert last change.
......
......@@ -61,6 +61,7 @@ static void ns_uni_to_glyphs (struct nsfont_info *font_info,
static void ns_glyph_metrics (struct nsfont_info *font_info,
unsigned char block);
#define INVALID_GLYPH 0xFFFF
/* ==========================================================================
......@@ -981,7 +982,7 @@ that causes need for cache in nsfont_open () */
ns_uni_to_glyphs (font_info, high);
g = font_info->glyphs[high][low];
return g == 0xFFFF ? FONT_INVALID_CODE : g;
return g == INVALID_GLYPH ? FONT_INVALID_CODE : g;
}
......@@ -1354,8 +1355,8 @@ is false when (FROM > 0 || TO < S->nchars). */
#else
g = glyphStorage->cglyphs[i];
/* TODO: is this a good check? maybe need to use coveredChars.. */
if (g > numGlyphs)
g = 0xFFFF; /* hopefully unused... */
if (g > numGlyphs || g == NSNullGlyph)
g = INVALID_GLYPH; /* hopefully unused... */
#endif
*glyphs = g;
}
......@@ -1483,7 +1484,7 @@ - (void)insertGlyphs: (const NSGlyph *)glyphs length: (NSUInteger)length
characterIndex: (NSUInteger)charIndex
{
len = glyphIndex+length;
for (i =glyphIndex; i<len; i++)
for (i =glyphIndex; i<len; i++)
cglyphs[i] = glyphs[i-glyphIndex];
if (len > maxGlyph)
maxGlyph = len;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment