1 --- cairo-1.8.8-orig/src/cairo-ft-font.c 2009-10-23 05:38:55.952822881 -0500
2 +++ cairo-1.8.8/src/cairo-ft-font.c 2009-10-23 06:20:52.435490600 -0500
3 @@ -1448,7 +1448,9 @@ _cairo_ft_options_merge (cairo_ft_option
4 options->base.subpixel_order = other->base.subpixel_order;
7 - if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT)
8 + options->base.hint_style = CAIRO_HINT_STYLE_DEFAULT;
10 + if (options->base.hint_style != CAIRO_HINT_STYLE_DEFAULT)
11 options->base.hint_style = other->base.hint_style;
13 if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)