summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2007-01-17 22:51:31 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2007-01-17 22:51:31 +0000
commitbff0e825ea0bbd7bb8cf453a7edfd31e7bfec004 (patch)
tree857c41264a0a125d1e3890a02fafeeaa2a66ddbf
parent8f889bf88b2e6be62af512d5fef5a1ec8bc93eba (diff)
downloadpango-bff0e825ea0bbd7bb8cf453a7edfd31e7bfec004.tar.gz
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
-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 1232eb9b..788bf78a 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-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 352c582e..88d967e9 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;