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/pangocairo-font.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/pangocairo-font.c')
| -rw-r--r-- | pango/pangocairo-font.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c index c36711d1..7635b2d0 100644 --- a/pango/pangocairo-font.c +++ b/pango/pangocairo-font.c @@ -79,6 +79,7 @@ _pango_cairo_font_install (PangoCairoFont *font, { _pango_cairo_warning_history.font_install = TRUE; g_critical ("_pango_cairo_font_install called with font == NULL, expect ugly output"); + cairo_set_font_face (cr, NULL); } return; } @@ -133,6 +134,9 @@ _pango_cairo_get_hex_box_info (PangoCairoFont *cfont) PangoFontDescription *mini_desc, *desc; cairo_scaled_font_t *scaled_font, *scaled_mini_font; + if (!cfont) + return NULL; + hbi = (PangoCairoHexBoxInfo *) g_object_get_data (G_OBJECT (cfont), "hex_box_info"); if (hbi) return hbi; @@ -255,7 +259,7 @@ _pango_cairo_get_glyph_extents_missing (PangoCairoFont *cfont, hbi = _pango_cairo_get_hex_box_info (cfont); rows = hbi->rows; - cols = ((glyph & ~PANGO_CAIRO_UNKNOWN_FLAG) > 0xffff ? 6 : 4) / rows; + cols = ((glyph & ~PANGO_GLYPH_UNKNOWN_FLAG) > 0xffff ? 6 : 4) / rows; if (ink_rect) { |