diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2017-12-19 00:36:43 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2017-12-23 17:04:27 -0500 |
commit | 375f7e8faf49d433b137a1b06033a92ac9e66778 (patch) | |
tree | 53d0b0ba73580abd668793550f5da85382e1325d | |
parent | 2fa3b1a542fac8a7c683ea6277a1e2c46e06dbdc (diff) | |
download | pango-375f7e8faf49d433b137a1b06033a92ac9e66778.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
-rw-r--r-- | pango/pangocairo-fcfont.c | 9 |
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; |