diff options
| -rw-r--r-- | pango/pangocoretext-fontmap.c | 1 | ||||
| -rw-r--r-- | pango/pangofc-fontmap.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c index 96e13bab..038287a0 100644 --- a/pango/pangocoretext-fontmap.c +++ b/pango/pangocoretext-fontmap.c @@ -1188,6 +1188,7 @@ find_best_match (PangoCoreTextFamily *font_family, for (i = 0; i < font_family->n_faces; i++) { new_desc = pango_font_face_describe (font_family->faces[i]); + pango_font_description_set_gravity (new_desc, pango_font_description_get_gravity (description)); if (pango_font_description_better_match (description, best_description, new_desc)) diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index c7193941..2df9d16c 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -835,8 +835,7 @@ filter_fontset_by_format (FcFontSet *fontset) const char *s; res = FcPatternGetString (fontset->fonts[i], FC_FONTFORMAT, 0, (FcChar8 **)(void*)&s); - g_assert (res == FcResultMatch); - if (pango_fc_is_supported_font_format (s)) + if (res == FcResultMatch && pango_fc_is_supported_font_format (s)) FcFontSetAdd (result, FcPatternDuplicate (fontset->fonts[i])); } |