wok-next annotate cairo/stuff/cairo-respect-fontconfig.patch @ rev 16515

Prepa for 5.0-RC1
author Christophe Lincoln <pankso@slitaz.org>
date Fri Apr 25 04:31:00 2014 +0200 (2014-04-25)
parents
children
rev   line source
slaxemulator@6628 1 diff -Nur cairo-1.8.6.orig/src/cairo-ft-font.c cairo-1.8.6/src/cairo-ft-font.c
slaxemulator@6628 2 --- cairo-1.8.6.orig/src/cairo-ft-font.c 2008-12-12 20:48:04.000000000 +0800
slaxemulator@6628 3 +++ cairo-1.8.6/src/cairo-ft-font.c 2009-02-20 14:56:57.000000000 +0800
slaxemulator@6628 4 @@ -1448,8 +1448,15 @@
slaxemulator@6628 5 if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT)
slaxemulator@6628 6 options->base.hint_style = other->base.hint_style;
slaxemulator@6628 7
slaxemulator@6628 8 - if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)
slaxemulator@6628 9 - options->base.hint_style = CAIRO_HINT_STYLE_NONE;
slaxemulator@6628 10 + //if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)
slaxemulator@6628 11 + //options->base.hint_style = CAIRO_HINT_STYLE_NONE;
slaxemulator@6628 12 +
slaxemulator@6628 13 + if (other->base.hint_style == CAIRO_HINT_STYLE_NONE ||
slaxemulator@6628 14 + other->base.hint_style == CAIRO_HINT_STYLE_SLIGHT ||
slaxemulator@6628 15 + other->base.hint_style == CAIRO_HINT_STYLE_MEDIUM ||
slaxemulator@6628 16 + other->base.hint_style == CAIRO_HINT_STYLE_FULL) {
slaxemulator@6628 17 + options->base.hint_style = other->base.hint_style;
slaxemulator@6628 18 + }
slaxemulator@6628 19
slaxemulator@6628 20 if (options->base.antialias == CAIRO_ANTIALIAS_NONE) {
slaxemulator@6628 21 if (options->base.hint_style == CAIRO_HINT_STYLE_NONE)