diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-03-15 23:00:28 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-03-15 23:00:28 +0000 |
| commit | cc35f77a1b4e40ba85d583d0b0f301c288adb930 (patch) | |
| tree | 2544826477ac2343fa2d121f6ef7438bb1fe770a /pango/pangocairo-fcfontmap.c | |
| parent | c6fb33e1dde1721132273b038923e1d2da3abba3 (diff) | |
| download | pango-cc35f77a1b4e40ba85d583d0b0f301c288adb930.tar.gz | |
Include the effect of the CTM in the FC_PIXEL_SIZE we set in the
2005-03-15 Owen Taylor <otaylor@redhat.com>
* pango/pangofc-fontmap.c: Include the effect of the
CTM in the FC_PIXEL_SIZE we set in the FcPattern.
(Fixes problems with getting the wrong font when drawing
the same font at multiple scales. Reported by Keith
Packard.)
* pango/pangofc-fontmap.h pango/pangocairo-fcfontmap.c
pango/pangocairo-fc.h pango/pangocairo-fontfont.c: Add
the PangoFontDescription to create_font() ... we need it
to get the right pixel size to combine with the CTM.
* pango/pangofc-fontmap.c (pango_fc_fontmap_get_dpi):
Extract out the logic for finding the DPI from the
size-listing code.
(pango_fc_font_map_get_render_key): Handle mix of
absolute and not sizes correctly.
Diffstat (limited to 'pango/pangocairo-fcfontmap.c')
| -rw-r--r-- | pango/pangocairo-fcfontmap.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pango/pangocairo-fcfontmap.c b/pango/pangocairo-fcfontmap.c index e05fd279..a1a107e9 100644 --- a/pango/pangocairo-fcfontmap.c +++ b/pango/pangocairo-fcfontmap.c @@ -112,11 +112,13 @@ pango_cairo_fc_font_map_get_render_key (PangoFcFontMap *fcfontmap, } static PangoFcFont * -pango_cairo_fc_font_map_create_font (PangoFcFontMap *fcfontmap, - PangoContext *context, - FcPattern *pattern) +pango_cairo_fc_font_map_create_font (PangoFcFontMap *fcfontmap, + PangoContext *context, + const PangoFontDescription *desc, + FcPattern *pattern) { - return _pango_cairo_fc_font_new (PANGO_CAIRO_FC_FONT_MAP (fcfontmap), context, pattern); + return _pango_cairo_fc_font_new (PANGO_CAIRO_FC_FONT_MAP (fcfontmap), + context, desc, pattern); } static void |