From 4827f94e1725c34d4b19d79f4c74f16a0dc3b0cb Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 19 Mar 2012 13:08:07 +0900 Subject: [PATCH] ftfont.c (ftfont_drive_otf): Mask bits of character code to make it fit in a valid range (Bug#11003). --- src/ChangeLog | 5 +++++ src/ftfont.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 07cc8dac1b..80bc42fa8c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-03-19 Kenichi Handa + + * ftfont.c (ftfont_drive_otf): Mask bits of character code to make + it fit in a valid range (Bug#11003). + 2012-03-12 Chong Yidong * eval.c (inhibit_lisp_code): Rename from diff --git a/src/ftfont.c b/src/ftfont.c index 3c45eb2f72..131465b4f8 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; } -- 2.20.1