diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-02-02 10:52:49 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-02-02 10:52:49 +0000 |
| commit | da58dbfdea113caa46448c0bb3bf945b4a18f502 (patch) | |
| tree | bd04c2e6d5d4f74ee5eef9a3dd8a1c2bdaeb5f7e /pango/pangoft2.c | |
| parent | 93be594100f783b409cba98f6c9d58060c4ef433 (diff) | |
| download | pango-da58dbfdea113caa46448c0bb3bf945b4a18f502.tar.gz | |
Use PANGO_GLYPH_NULL for when no glyph should be drawn. Use
2006-02-02 Behdad Esfahbod <behdad@gnome.org>
* modules/arabic/arabic-fc.c, modules/basic/basic-atsui.c,
modules/basic/basic-fc.c, modules/basic/basic-win32.c,
modules/basic/basic-x.c, modules/hangul/hangul-fc.c,
modules/hebrew/hebrew-fc.c, modules/indic/indic-fc.c,
modules/khmer/khmer-fc.c, modules/syriac/syriac-fc.c,
modules/thai/thai-fc.c, modules/tibetan/tibetan-fc.c,
pango/fonts.c, pango/pango-engine-private.h pango/pango-types.h,
pango/pangocairo-fcfont.c, pango/pangocairo-font.c,
pango/pangocairo-private.h, pango/pangocairo-render.c,
pango/pangofc-decoder.c, pango/pangofc-font.c,
pango/pangoft2-render.c, pango/pangoft2.c pango/pangowin32.c,
pango/pangox.c, pango/pangoxft-font.c pango/pangoxft-private.h,
pango/pangoxft-render.c, pango/shape.c: Use PANGO_GLYPH_NULL for
when no glyph should be drawn. Use PANGO_GLYPH_UNKNOWN_FLAG for
all backends to mark unknown flags. There's no need for
pango_font_get_unknown_glyph() anymore, since all backends know
how to handle PANGO_GLYPH_UNKNOWN_FLAG gracefully. We may add
that in the future however. (fixes bug #73147, closes bug #329524)
Diffstat (limited to 'pango/pangoft2.c')
| -rw-r--r-- | pango/pangoft2.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pango/pangoft2.c b/pango/pangoft2.c index 17dde11e..dbacf724 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -296,6 +296,17 @@ pango_ft2_font_get_glyph_extents (PangoFont *font, { PangoFT2GlyphInfo *info; + if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) + glyph = PANGO_GLYPH_NULL; + if (glyph == PANGO_GLYPH_NULL) + { + if (ink_rect) + ink_rect->x = ink_rect->y = ink_rect->width = ink_rect->height = 0; + if (logical_rect) + logical_rect->x = logical_rect->y = logical_rect->width = logical_rect->height = 0; + return; + } + info = pango_ft2_font_get_glyph_info (font, glyph, TRUE); if (ink_rect) |