[Emacs-diffs] /srv/bzr/emacs/trunk r107629: ftfont.c (ftfont_drive_otf): Mask bits of character code to make it fit in a valid range (Bug#11003).

[Kenichi Handa]

------------------------------------------------------------
revno: 107629 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Mon 2012-03-19 13:18:26 +0900
message:
  ftfont.c (ftfont_drive_otf): Mask bits of character code to make it fit in a 
valid range (Bug#11003).
modified:
  src/ChangeLog
  src/ftfont.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-03-18 16:57:39 +0000
+++ b/src/ChangeLog     2012-03-19 04:17:50 +0000
@@ -1,3 +1,8 @@
+2012-03-19  Kenichi Handa  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xdisp.c (cursor_row_p): Even if the glyph row ends in a string

=== modified file 'src/ftfont.c'
--- a/src/ftfont.c      2012-01-19 07:21:25 +0000
+++ b/src/ftfont.c      2012-03-19 04:08:07 +0000
@@ -1856,7 +1856,7 @@
   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;
     }