diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-12-24 04:43:17 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-12-24 04:43:17 +0000 |
| commit | 856f7cec6ef16a1624c48e58e0e43520978b9745 (patch) | |
| tree | b242fb81284500b5ccee3460a25d8613b7099833 /pango/pangoft2-fontmap.c | |
| parent | d9fb0e4a427970f639c0e922f288cb2aac7dc8fe (diff) | |
| download | pango-856f7cec6ef16a1624c48e58e0e43520978b9745.tar.gz | |
Bug 384543 – FcFontMatch misuse
2006-12-23 Behdad Esfahbod <behdad@gnome.org>
Bug 384543 – FcFontMatch misuse
* pango/pangofc-fontmap.c (pango_fc_face_describe):
Call FcConfigSubstitute and FcDefaultSubstitute before calling
FcFontMatch.
* pango/pangoft2.c (load_fallback_face):
Call _pango_ft2_font_map_default_substitute().
* pango/pangocairo-fcfontmap.c
(pango_cairo_fc_font_map_context_substitute):
Handle the case of context == NULL.
Diffstat (limited to 'pango/pangoft2-fontmap.c')
| -rw-r--r-- | pango/pangoft2-fontmap.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 333e00bf..639ddebe 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -62,8 +62,6 @@ struct _PangoFT2FontMapClass }; static void pango_ft2_font_map_finalize (GObject *object); -static void pango_ft2_font_map_default_substitute (PangoFcFontMap *fcfontmap, - FcPattern *pattern); static PangoFcFont * pango_ft2_font_map_new_font (PangoFcFontMap *fcfontmap, FcPattern *pattern); static double pango_ft2_font_map_get_resolution (PangoFcFontMap *fcfontmap, @@ -80,7 +78,7 @@ pango_ft2_font_map_class_init (PangoFT2FontMapClass *class) PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (class); gobject_class->finalize = pango_ft2_font_map_finalize; - fcfontmap_class->default_substitute = pango_ft2_font_map_default_substitute; + fcfontmap_class->default_substitute = _pango_ft2_font_map_default_substitute; fcfontmap_class->new_font = pango_ft2_font_map_new_font; fcfontmap_class->get_resolution = pango_ft2_font_map_get_resolution; } @@ -323,8 +321,8 @@ _pango_ft2_font_map_get_renderer (PangoFT2FontMap *ft2fontmap) return ft2fontmap->renderer; } -static void -pango_ft2_font_map_default_substitute (PangoFcFontMap *fcfontmap, +void +_pango_ft2_font_map_default_substitute (PangoFcFontMap *fcfontmap, FcPattern *pattern) { PangoFT2FontMap *ft2fontmap = PANGO_FT2_FONT_MAP (fcfontmap); |