From 8ea9e0d36bde39b68b33bd9ae71e8b0611123626 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 17 Jan 2007 22:53:35 +0000 Subject: =?UTF-8?q?Bug=20395328=20=E2=80=93=20Map=20kATSDeletedGlyphcode?= =?UTF-8?q?=20to=20PANGO=5FGLYPH=5FEMPTY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2007-01-17 Behdad Esfahbod Bug 395328 – Map kATSDeletedGlyphcode to PANGO_GLYPH_EMPTY * modules/basic/basic-atsui.c (set_glyph): Handle kATSDeletedGlyphcode. svn path=/branches/pango-1-14/; revision=2171 --- ChangeLog | 7 +++++++ modules/basic/basic-atsui.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ae8c6e6c..6ea1a233 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-01-17 Behdad Esfahbod + + Bug 395328 – Map kATSDeletedGlyphcode to PANGO_GLYPH_EMPTY + + * modules/basic/basic-atsui.c (set_glyph): Handle + kATSDeletedGlyphcode. + 2007-01-16 Behdad Esfahbod * 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; -- cgit v1.2.1