diff options
| author | Kenichi Handa <handa@m17n.org> | 2012-03-19 13:08:07 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2012-03-19 13:08:07 +0900 |
| commit | 4827f94e1725c34d4b19d79f4c74f16a0dc3b0cb (patch) | |
| tree | f7388f6e65d59e45911581173689919f5c78971f /src | |
| parent | 4b05d72231e7653b1c4eee9ecf95758f7767764a (diff) | |
| download | emacs-4827f94e1725c34d4b19d79f4c74f16a0dc3b0cb.tar.gz | |
ftfont.c (ftfont_drive_otf): Mask bits of character code to make it fit in a valid range (Bug#11003).
Diffstat (limited to 'src')
| -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 07cc8dac1b3..80bc42fa8c6 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-12 Chong Yidong <cyd@gnu.org> * eval.c (inhibit_lisp_code): Rename from 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; } |