From 9a76745200aaafcd47e049f250d4b6be7537e659 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Mon, 22 Dec 2014 23:09:28 +0100 Subject: [PATCH] Respect fontconfig's hintstyle. --- src/cairo-ft-font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index 87e733b..442f223 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -1844,8 +1844,8 @@ _cairo_ft_options_merge (cairo_ft_options_t *options, if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT) options->base.hint_style = other->base.hint_style; - if (other->base.hint_style == CAIRO_HINT_STYLE_NONE) - options->base.hint_style = CAIRO_HINT_STYLE_NONE; + if (other->base.hint_style != CAIRO_HINT_STYLE_DEFAULT) + options->base.hint_style = other->base.hint_style; if (options->base.lcd_filter == CAIRO_LCD_FILTER_DEFAULT) options->base.lcd_filter = other->base.lcd_filter; -- 2.2.1