diff options
| author | Tor Lillqvist <tml@iki.fi> | 2002-09-24 20:51:44 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2002-09-24 20:51:44 +0000 |
| commit | dcbf564cad728558921cbb80e4e2022471d5ae33 (patch) | |
| tree | 5763ebc3ed6510e636583e786b6df8c39e1e944e /modules/basic/basic-win32.c | |
| parent | 65ece991798265a60e4b75cd23be8484560b6c0a (diff) | |
| download | pango-dcbf564cad728558921cbb80e4e2022471d5ae33.tar.gz | |
Merge from pango-1-0:
2002-09-24 Tor Lillqvist <tml@iki.fi>
* pango/pangowin32.c: Use PANGO_PIXELS macro throughout instead of
dividing by PANGO_SCALE.
(pango_win32_render): New try. This time handle both glyphs at
code point 0, specifically put there by PangoLayout to indicate
spacing (for tab handling), and actual invalid glyphs noticed by
the shaper. Invalid glyphs are indicated by the flag
PANGO_WIN32_UNKNOWN_FLAG. (Idea taken frompangoxft-font.c)
(pango_win32_get_unknown_glyph): Take also the char as parameter,
return the same char with the above flag ORed in.
(pango_win32_font_get_glyph_extents): If the glyph is flagged as
invalid, look for glyph 0 instead. Use g_win32_error_message() in
warning message instead of numeric error code.
* pango/pangowin32.h: Add the new parameter to the
pango_win32_get_unknown_glyph() declaration. Surround the API used
by shape engines with #ifdef PANGO_ENABLE_ENGINE.
* modules/basic/basic-win32.c: Change call accordingly.
Diffstat (limited to 'modules/basic/basic-win32.c')
| -rw-r--r-- | modules/basic/basic-win32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c index b278717b..2c3f4629 100644 --- a/modules/basic/basic-win32.c +++ b/modules/basic/basic-win32.c @@ -230,7 +230,7 @@ basic_engine_shape (PangoFont *font, } } else - set_glyph (font, glyphs, i, p - text, pango_win32_get_unknown_glyph (font)); + set_glyph (font, glyphs, i, p - text, pango_win32_get_unknown_glyph (font, wc)); } p = g_utf8_next_char (p); |