summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2017-12-19 00:36:43 -0500
committerBehdad Esfahbod <behdad@behdad.org>2018-01-03 12:41:46 +0000
commite4e30535e3ed5c8e33b2134d5a640166f6e3525b (patch)
treedb8bb436d1b7ca45547ee4f330f2071f1259a4b8 /pango
parent905ccc5bfd4a1c4d11abb39e8b495cc8a966436a (diff)
downloadpango-e4e30535e3ed5c8e33b2134d5a640166f6e3525b.tar.gz
[cairo] Don't set font variations on cairo_font_options_t
We pass them in through FcPattern to the cairo_face already, no need to pass here again. Yeah, I know... /tears
Diffstat (limited to 'pango')
-rw-r--r--pango/pangocairo-fcfont.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c
index ef4273e7..e153c13e 100644
--- a/pango/pangocairo-fcfont.c
+++ b/pango/pangocairo-fcfont.c
@@ -226,7 +226,6 @@ _pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap,
double size;
int i;
cairo_font_options_t *options;
- const char *variations;
g_return_val_if_fail (PANGO_IS_CAIRO_FC_FONT_MAP (cffontmap), NULL);
g_return_val_if_fail (pattern != NULL, NULL);
@@ -253,11 +252,6 @@ _pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap,
cairo_matrix_scale (&font_matrix, size, size);
options = pango_fc_font_key_get_context_key (key);
- variations = pango_fc_font_key_get_variations (key);
- if (variations) {
- options = cairo_font_options_copy (options);
- cairo_font_options_set_variations (options, variations);
- }
_pango_cairo_font_private_initialize (&cffont->cf_priv,
(PangoCairoFont *) cffont,
@@ -266,9 +260,6 @@ _pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap,
pango_fc_font_key_get_matrix (key),
&font_matrix);
- if (variations)
- cairo_font_options_destroy (options);
-
((PangoFcFont *)(cffont))->is_hinted = _pango_cairo_font_private_is_metrics_hinted (&cffont->cf_priv);
return (PangoFcFont *) cffont;