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/pangofc-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/pangofc-font.c')
| -rw-r--r-- | pango/pangofc-font.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 953af1d6..8dafbcb0 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -82,6 +82,7 @@ pango_fc_font_class_init (PangoFcFontClass *class) class->has_char = pango_fc_font_real_has_char; class->get_glyph = pango_fc_font_real_get_glyph; + class->get_unknown_glyph = NULL; object_class->finalize = pango_fc_font_finalize; object_class->set_property = pango_fc_font_set_property; @@ -517,7 +518,7 @@ pango_fc_font_real_get_glyph (PangoFcFont *font, index = FcFreeTypeCharIndex (face, wc); if (index > (FT_UInt)face->num_glyphs) - index = 0; + index = PANGO_GLYPH_NULL; PANGO_FC_FONT_UNLOCK_FACE (font); @@ -599,7 +600,7 @@ pango_fc_font_has_char (PangoFcFont *font, * for @font. If you only want to determine * whether the font has the glyph, use pango_fc_font_has_char(). * - * Return value: the glyph index, or 0, if the Unicode + * Return value: the glyph index, or %PANGO_GLYPH_NULL, if the Unicode * character doesn't exist in the font. * * Since: 1.4 @@ -641,7 +642,10 @@ pango_fc_font_get_unknown_glyph (PangoFcFont *font, { g_return_val_if_fail (PANGO_IS_FC_FONT (font), 0); - return PANGO_FC_FONT_GET_CLASS (font)->get_unknown_glyph (font, wc); + if (PANGO_FC_FONT_GET_CLASS (font)->get_unknown_glyph) + return PANGO_FC_FONT_GET_CLASS (font)->get_unknown_glyph (font, wc); + + return PANGO_GLYPH_UNKNOWN_FLAG | (PangoGlyph)wc; } void |