summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-02-22 13:26:51 +0000
committerMatthias Clasen <mclasen@redhat.com>2021-02-22 13:26:51 +0000
commite9d04daa515609d91b30666b88b0d41bc8b74d2c (patch)
tree026d69e6771c721633b2bb4a45eb43f50c98603e /pango
parent3fea9968434c7d6c0b73c481d27d5e2cfe71fda1 (diff)
parent3fc7b26f922d2b014a2c9731bf2215b710e39251 (diff)
downloadpango-e9d04daa515609d91b30666b88b0d41bc8b74d2c.tar.gz
Merge branch 'fix-FcConfig-uses' into 'master'
Fix FcConfig uses See merge request GNOME/pango!288
Diffstat (limited to 'pango')
-rw-r--r--pango/pangofc-fontmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index fd17309d..3b12d246 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;
@@ -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)
{