summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--modules/basic/basic-atsui.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ae8c6e6c..6ea1a233 100644
--- 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/ellipsize.c (get_cluster_width): Fix width calculation.
diff --git a/modules/basic/basic-atsui.c b/modules/basic/basic-atsui.c
index b394102c..e2505aca 100644
--- 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;