diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-03-03 19:40:26 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-03-03 19:40:26 +0000 |
| commit | 6a81555674685af6032b3963a802580e9288460f (patch) | |
| tree | 7e6617222f8388691e60decb153f206d80a49e58 | |
| parent | 650ff5d0fbec3e51eeebadbaca7b115253fc3ba2 (diff) | |
| download | pango-6a81555674685af6032b3963a802580e9288460f.tar.gz | |
Call XftCharIndex() on the right font. (#163511)
2005-03-03 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-render.c (pango_xft_renderer_draw_glyphs):
Call XftCharIndex() on the right font. (#163511)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | pango/pangoxft-render.c | 3 |
3 files changed, 12 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2005-03-03 Owen Taylor <otaylor@redhat.com> + * pango/pangoxft-render.c (pango_xft_renderer_draw_glyphs): + Call XftCharIndex() on the right font. (#163511) + +2005-03-03 Owen Taylor <otaylor@redhat.com> + * pango/opentype/ftxopen.c (Coverage_Index1, Coverage_Index2, Get_Class2): For all binary searches, handle the case where the number of items is 0. (#162977, Nick Lamb) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 4fad4f58..d7dc41d0 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,10 @@ 2005-03-03 Owen Taylor <otaylor@redhat.com> + * pango/pangoxft-render.c (pango_xft_renderer_draw_glyphs): + Call XftCharIndex() on the right font. (#163511) + +2005-03-03 Owen Taylor <otaylor@redhat.com> + * pango/opentype/ftxopen.c (Coverage_Index1, Coverage_Index2, Get_Class2): For all binary searches, handle the case where the number of items is 0. (#162977, Nick Lamb) diff --git a/pango/pangoxft-render.c b/pango/pangoxft-render.c index b3647a1f..b649afe4 100644 --- a/pango/pangoxft-render.c +++ b/pango/pangoxft-render.c @@ -343,6 +343,7 @@ pango_xft_renderer_draw_glyphs (PangoRenderer *renderer, int cols; 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; @@ -380,7 +381,7 @@ pango_xft_renderer_draw_glyphs (PangoRenderer *renderer, for (col = 0; col < cols; col++) { draw_glyph (renderer, mini_font, - XftCharIndex (NULL, xft_font, + XftCharIndex (NULL, mini_xft_font, buf[row * cols + col] & 0xff), xs[col+1], ys[row+1]); |