From 479f99dc3bf4c7e74a77ebbc558847b8fb39f002 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 19 Aug 2020 07:42:31 -0400 Subject: Use the right FcConfig for FcRenderPrepare Passing NULL for a config argument in a fontconfig api means we are using the default configuration, which may be different from the one the fontmap is supposed to be using. Fix an instance of this in pango_fc_fontset_load_next_font. --- pango/pangofc-fontmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index fd17309d..2009c46a 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -978,7 +978,7 @@ pango_fc_fontset_load_next_font (PangoFcFontset *fontset) if (prepare) { - font_pattern = FcFontRenderPrepare (NULL, pattern, font_pattern); + font_pattern = FcFontRenderPrepare (fontset->key->fontmap->priv->config, pattern, font_pattern); if (G_UNLIKELY (!font_pattern)) return NULL; -- cgit v1.2.1 From 3fc7b26f922d2b014a2c9731bf2215b710e39251 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 22 Feb 2021 08:11:40 -0500 Subject: Use the right FcConfig for FcFontList Passing NULL for a config argument in a fontconfig api means we are using the default configuration, which may be different from the one the fontmap is supposed to be using. Fix an instance of this in pango_fc_face_list_sizes. --- pango/pangofc-fontmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 2009c46a..3b12d246 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -2652,7 +2652,7 @@ pango_fc_face_list_sizes (PangoFontFace *face, objectset = FcObjectSetCreate (); FcObjectSetAdd (objectset, FC_PIXEL_SIZE); - fontset = FcFontList (NULL, pattern, objectset); + fontset = FcFontList (fcface->family->fontmap->priv->config, pattern, objectset); if (fontset) { -- cgit v1.2.1