diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2017-12-19 00:01:54 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2017-12-23 17:04:27 -0500 |
commit | 2fa3b1a542fac8a7c683ea6277a1e2c46e06dbdc (patch) | |
tree | 56e8bf286d139bc01a117a75a38c19b41a4d4db4 | |
parent | 65e4e6cc1a4a059756105fb0c9483d9c270282f4 (diff) | |
download | pango-2fa3b1a542fac8a7c683ea6277a1e2c46e06dbdc.tar.gz |
[fc] Only set variations if non-empty
-rw-r--r-- | pango/pangofc-fontmap.c | 4 | ||||
-rw-r--r-- | pango/pangofc-fontmap.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 871b2704..4e7d74bb 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -1519,9 +1519,11 @@ pango_fc_make_pattern (const PangoFontDescription *description, FC_DPI, FcTypeDouble, dpi, FC_SIZE, FcTypeDouble, pixel_size * (72. / 1024. / dpi), FC_PIXEL_SIZE, FcTypeDouble, pixel_size / 1024., - PANGO_FC_FONT_VARIATIONS, FcTypeString, variations ? variations : "", NULL); + if (variations) + FcPatternAddString (pattern, PANGO_FC_FONT_VARIATIONS, (FcChar8*) variations); + if (pango_font_description_get_family (description)) { families = g_strsplit (pango_font_description_get_family (description), ",", -1); diff --git a/pango/pangofc-fontmap.h b/pango/pangofc-fontmap.h index 63452a83..bff288b6 100644 --- a/pango/pangofc-fontmap.h +++ b/pango/pangofc-fontmap.h @@ -319,8 +319,8 @@ PangoFontDescription *pango_fc_font_description_from_pattern (FcPattern *pattern * String representing a fontconfig property name that Pango reads from font * patterns to populate list of OpenType font variations to be used for a font. * - * The property will have a number of string elements, each of which is the - * OpenType axis setting of the form AXIS=VALUE. + * The property will have a string elements, each of which a comma-separated + * list of OpenType axis setting of the form AXIS=VALUE. */ #define PANGO_FC_FONT_VARIATIONS "fontvariations" |