diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-02-02 12:03:51 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-02-02 12:03:51 +0000 |
| commit | d071090cb8b83d07a251fdae73589265e685809e (patch) | |
| tree | 10d18298b57a0ab478efa053f3f810362271d92d | |
| parent | b56f82723b5a72ca43769526377a90f5916980fc (diff) | |
| download | pango-d071090cb8b83d07a251fdae73589265e685809e.tar.gz | |
Do unknown glyph extents here too.
2006-02-02 Behdad Esfahbod <behdad@gnome.org>
* pango/pangoft2.c: Do unknown glyph extents here too.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | pango/pangoft2.c | 14 |
2 files changed, 16 insertions, 2 deletions
@@ -1,5 +1,9 @@ 2006-02-02 Behdad Esfahbod <behdad@gnome.org> + * pango/pangoft2.c: Do unknown glyph extents here too. + +2006-02-02 Behdad Esfahbod <behdad@gnome.org> + * pango/pangoxft-font.c, pango/pangoxft-render.c: Guard Xft backend agains crashes too. diff --git a/pango/pangoft2.c b/pango/pangoft2.c index dbacf724..459fa0ab 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -301,9 +301,19 @@ pango_ft2_font_get_glyph_extents (PangoFont *font, if (glyph == PANGO_GLYPH_NULL) { if (ink_rect) - ink_rect->x = ink_rect->y = ink_rect->width = ink_rect->height = 0; + { + ink_rect->x = 0; + ink_rect->y = 0; + ink_rect->height = PANGO_UNKNOWN_GLYPH_HEIGHT * PANGO_SCALE; + ink_rect->width = PANGO_UNKNOWN_GLYPH_WIDTH * PANGO_SCALE; + } if (logical_rect) - logical_rect->x = logical_rect->y = logical_rect->width = logical_rect->height = 0; + { + logical_rect->x = 0; + logical_rect->y = 0; + logical_rect->height = PANGO_UNKNOWN_GLYPH_HEIGHT * PANGO_SCALE; + logical_rect->width = PANGO_UNKNOWN_GLYPH_WIDTH * PANGO_SCALE; + } return; } |