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/pangocairo-fcfontmap.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/pangocairo-fcfontmap.c')
| -rw-r--r-- | pango/pangocairo-fcfontmap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pango/pangocairo-fcfontmap.c b/pango/pangocairo-fcfontmap.c index 83a39616..cc1360ba 100644 --- a/pango/pangocairo-fcfontmap.c +++ b/pango/pangocairo-fcfontmap.c @@ -94,8 +94,9 @@ pango_cairo_fc_font_map_context_substitute (PangoFcFontMap *fcfontmap, { FcConfigSubstitute (NULL, pattern, FcMatchPattern); - cairo_ft_font_options_substitute (_pango_cairo_context_get_merged_font_options (context), - pattern); + if (context) + cairo_ft_font_options_substitute (_pango_cairo_context_get_merged_font_options (context), + pattern); FcDefaultSubstitute (pattern); } |