diff options
| author | Hans Breuer <hans@breuer.org> | 2006-06-05 16:29:19 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2006-06-05 16:29:19 +0000 |
| commit | 4590a9287d0d1e085c089b0b339afe30caabfcea (patch) | |
| tree | a789bbbc677e38f07f590f2857ced1c79e98912a /pango/pangocairo-win32font.c | |
| parent | 9663ade3f376a00f8d66daf3ad7c89a1b521da16 (diff) | |
| download | pango-4590a9287d0d1e085c089b0b339afe30caabfcea.tar.gz | |
not only handle PANGO_GLYPH_EMPTY but also PANGO_GLYPH_UNKNOWN_FLAG. The
2006-05-05 Hans Breuer <hans@breuer.org>
* pango/pangocairo-win32font.c(compute_glyph_extents) : not only
handle PANGO_GLYPH_EMPTY but also PANGO_GLYPH_UNKNOWN_FLAG.
The latter is needed to have proper sizing of the "hex box" for
missing glyphs. It also stops cairo complaining about unknown glyphs.
Fixes part of bug #343796.
* pango/makefile.msc : create $(PRJ_TOP)\config.h.win32. (Not
changing in years does not necessarily mean it is not used)
* pango/testfonts.c : make family_name survive
pango_font_description_free(), it is used later on
Diffstat (limited to 'pango/pangocairo-win32font.c')
| -rw-r--r-- | pango/pangocairo-win32font.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c index 53ced191..ddfe0340 100644 --- a/pango/pangocairo-win32font.c +++ b/pango/pangocairo-win32font.c @@ -212,7 +212,16 @@ compute_glyph_extents (PangoFont *font, logical_rect->width = 0; logical_rect->height = (font_extents.ascent + font_extents.descent) * PANGO_SCALE; - if (glyph != PANGO_GLYPH_EMPTY) + if (glyph == PANGO_GLYPH_EMPTY) + { + /* already initialized above */ + } + else if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) + { + /* space for the hex box */ + _pango_cairo_get_glyph_extents_missing(cfont, glyph, ink_rect, logical_rect); + } + else { cairo_glyph.index = glyph; cairo_glyph.x = 0; |