diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | pango/shape.c | 21 |
2 files changed, 16 insertions, 9 deletions
@@ -8,7 +8,9 @@ * pango/pango-shape.c (pango_shape): Instead of crashing if the shaper failed to produce any glyphs, print out a warning message containing the name of the font, and mark the font such that we don't keep - printing warning for the same font. + printing warning for the same font. Moreover, inject one whitespace + glyph per character, so you just see nothing, but everything works + otherwise. 2006-01-28 Behdad Esfahbod <behdad@gnome.org> diff --git a/pango/shape.c b/pango/shape.c index 24902a47..03020153 100644 --- a/pango/shape.c +++ b/pango/shape.c @@ -85,15 +85,20 @@ pango_shape (const gchar *text, if (!glyphs->num_glyphs) { - pango_glyph_string_set_size (glyphs, 1); + /* If failed to get glyphs, put a whitespace glyph per character + */ + pango_glyph_string_set_size (glyphs, g_utf8_strlen (text, length)); - glyphs->glyphs[0].glyph = 0; - - glyphs->glyphs[0].geometry.x_offset = 0; - glyphs->glyphs[0].geometry.y_offset = 0; - glyphs->glyphs[0].geometry.width = 0; - - glyphs->log_clusters[0] = 0; + for (i = 0; i < glyphs->num_glyphs; i++) + { + glyphs->glyphs[i].glyph = 0; + + glyphs->glyphs[i].geometry.x_offset = 0; + glyphs->glyphs[i].geometry.y_offset = 0; + glyphs->glyphs[i].geometry.width = 10 * PANGO_SCALE; + + glyphs->log_clusters[i] = i; + } } /* Set glyphs[i].attr.is_cluster_start based on log_clusters[] |