blob: 55912cd2371e7308c1179f335cb1f5a96516cd65 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
|
--- a/src/cairo-ft-font.c 2015-03-10 23:21:07.000000000 +0100
+++ b/src/cairo-ft-font.c 2015-03-11 21:59:05.747697134 +0100
@@ -1841,7 +1841,9 @@ _cairo_ft_options_merge (cairo_ft_option
options->base.subpixel_order = other->base.subpixel_order;
}
- if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT)
+ options->base.hint_style = CAIRO_HINT_STYLE_DEFAULT;
+
+ if (other->base.hint_style != CAIRO_HINT_STYLE_DEFAULT)
options->base.hint_style = other->base.hint_style;
if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)
|