diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/ftfont.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index adfa363e253..8b1221ab6d8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-03-19 Kenichi Handa <handa@m17n.org> + + * ftfont.c (ftfont_drive_otf): Mask bits of character code to make + it fit in a valid range (Bug#11003). + 2012-03-18 Eli Zaretskii <eliz@gnu.org> * xdisp.c (cursor_row_p): Even if the glyph row ends in a string diff --git a/src/ftfont.c b/src/ftfont.c index 3c45eb2f72f..131465b4f85 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -1856,7 +1856,7 @@ ftfont_drive_otf (MFLTFont *font, setup_otf_gstring (len); for (i = 0; i < len; i++) { - otf_gstring.glyphs[i].c = in->glyphs[from + i].c; + otf_gstring.glyphs[i].c = in->glyphs[from + i].c & 0x11FFFF; otf_gstring.glyphs[i].glyph_id = in->glyphs[from + i].code; } |