fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 06:28:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[ft] Use variations from ft_options, not scaled-font

Browse source 
Otherwise the variations from FcPattern won't be applied.
This commit is contained in:
Behdad Esfahbod 2017-12-19 00:38:25 -05:00
parent 976b34c31c
commit 82107467f0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cairo-ft-font.c
View file

@ -2355,7 +2355,7 @@ _cairo_ft_scaled_glyph_load_glyph (cairo_ft_scaled_font_t *scaled_font,
if (unlikely (status))
return status;
cairo_ft_apply_variations (face, scaled_font->unscaled->id, scaled_font->base.options.variations);
cairo_ft_apply_variations (face, scaled_font->unscaled->id, scaled_font->ft_options.base.variations);
error = FT_Load_Glyph (face,
_cairo_scaled_glyph_index(scaled_glyph),
@ -3784,7 +3784,7 @@ cairo_ft_scaled_font_lock_face (cairo_scaled_font_t *abstract_font)
return NULL;
}
cairo_ft_apply_variations (face, scaled_font->unscaled->id, scaled_font->base.options.variations);
cairo_ft_apply_variations (face, scaled_font->unscaled->id, scaled_font->ft_options.base.variations);
/* Note: We deliberately release the unscaled font's mutex here,
* so that we are not holding a lock across two separate calls to