diff options
Diffstat (limited to 'pango/pangocairo-font.c')
| -rw-r--r-- | pango/pangocairo-font.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c index 8b1f12d3..3bf83857 100644 --- a/pango/pangocairo-font.c +++ b/pango/pangocairo-font.c @@ -735,11 +735,20 @@ _pango_cairo_font_private_get_glyph_extents_missing (PangoCairoFontPrivate *cf_p ch = glyph & ~PANGO_GLYPH_UNKNOWN_FLAG; - rows = hbi->rows; if (G_UNLIKELY (glyph == PANGO_GLYPH_INVALID_INPUT || ch > 0x10FFFF)) - cols = 1; + { + rows = hbi->rows; + cols = 1; + } + else if (pango_get_ignorable_size (ch, &rows, &cols)) + { + /* We special-case ignorables when rendering hex boxes */ + } else - cols = ((glyph & ~PANGO_GLYPH_UNKNOWN_FLAG) > 0xffff ? 6 : 4) / rows; + { + rows = hbi->rows; + cols = ((glyph & ~PANGO_GLYPH_UNKNOWN_FLAG) > 0xffff ? 6 : 4) / rows; + } if (ink_rect) { |