Bug 395328 – Map kATSDeletedGlyphcode to PANGO_GLYPH_EMPTY

2007-01-17  Behdad Esfahbod  <behdad@gnome.org>

        Bug 395328 – Map kATSDeletedGlyphcode to PANGO_GLYPH_EMPTY

        * modules/basic/basic-atsui.c (set_glyph): Handle
        kATSDeletedGlyphcode.

svn path=/trunk/; revision=2170

diff --git a/ChangeLog b/ChangeLog
index 1232eb9..788bf78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-17  Behdad Esfahbod  <behdad@gnome.org>
+
+       Bug 395328 – Map kATSDeletedGlyphcode to PANGO_GLYPH_EMPTY
+
+       * modules/basic/basic-atsui.c (set_glyph): Handle
+       kATSDeletedGlyphcode.
+
 2007-01-16  Behdad Esfahbod  <behdad@gnome.org>
 
        * pango-view/viewer-render.c (make_layout): Fix typo when rounding

diff --git a/modules/basic/basic-atsui.c b/modules/basic/basic-atsui.c
index 352c582..88d967e 100644 (file)
--- a/modules/basic/basic-atsui.c
+++ b/modules/basic/basic-atsui.c
@@ -85,7 +85,8 @@ set_glyph (PangoFont        *font,
 {
   PangoRectangle logical_rect;
 
-  glyphs->glyphs[i].glyph = glyph;
+  glyphs->glyphs[i].glyph = G_UNLIKELY (glyph == kATSDeletedGlyphcode) ?
+                           PANGO_GLYPH_EMPTY : glyph;
 
   glyphs->glyphs[i].geometry.x_offset = 0;
   glyphs->glyphs[i].geometry.y_offset = 0;