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/pangoxft-render.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/pangoxft-render.c')
| -rw-r--r-- | pango/pangoxft-render.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pango/pangoxft-render.c b/pango/pangoxft-render.c index 3df15245..3e089bdd 100644 --- a/pango/pangoxft-render.c +++ b/pango/pangoxft-render.c @@ -335,9 +335,9 @@ pango_xft_renderer_draw_glyphs (PangoRenderer *renderer, int glyph_x = x + x_off + glyphs->glyphs[i].geometry.x_offset; int glyph_y = y + glyphs->glyphs[i].geometry.y_offset; - if (glyph) + if (glyph != PANGO_GLYPH_NULL) { - if (glyph & PANGO_XFT_UNKNOWN_FLAG) + if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) { char buf[7]; int ys[3]; @@ -348,7 +348,7 @@ pango_xft_renderer_draw_glyphs (PangoRenderer *renderer, PangoFont *mini_font = _pango_xft_font_get_mini_font (xfont); XftFont *mini_xft_font = pango_xft_font_get_font (mini_font); - glyph &= ~PANGO_XFT_UNKNOWN_FLAG; + glyph &= ~PANGO_GLYPH_UNKNOWN_FLAG; ys[0] = glyph_y - PANGO_SCALE * xft_font->ascent + PANGO_SCALE * (((xft_font->ascent + xft_font->descent) - (xfont->mini_height * 2 + xfont->mini_pad * 5 + PANGO_SCALE / 2) / PANGO_SCALE) / 2); ys[1] = ys[0] + 2 * xfont->mini_pad + xfont->mini_height; |