wok-6.x diff cairo/stuff/cairo-respect-fontconfig.patch @ rev 9517

Up: git to 1.7.4.4.
author Christopher Rogers <slaxemulator@gmail.com>
date Thu Apr 07 05:24:37 2011 +0000 (2011-04-07)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/cairo/stuff/cairo-respect-fontconfig.patch	Thu Apr 07 05:24:37 2011 +0000
     1.3 @@ -0,0 +1,21 @@
     1.4 +diff -Nur cairo-1.8.6.orig/src/cairo-ft-font.c cairo-1.8.6/src/cairo-ft-font.c
     1.5 +--- cairo-1.8.6.orig/src/cairo-ft-font.c	2008-12-12 20:48:04.000000000 +0800
     1.6 ++++ cairo-1.8.6/src/cairo-ft-font.c	2009-02-20 14:56:57.000000000 +0800
     1.7 +@@ -1448,8 +1448,15 @@
     1.8 +     if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT)
     1.9 + 	options->base.hint_style = other->base.hint_style;
    1.10 + 
    1.11 +-    if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)
    1.12 +-	options->base.hint_style = CAIRO_HINT_STYLE_NONE;
    1.13 ++    //if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)
    1.14 ++	//options->base.hint_style = CAIRO_HINT_STYLE_NONE;
    1.15 ++
    1.16 ++	if (other->base.hint_style == CAIRO_HINT_STYLE_NONE ||
    1.17 ++		other->base.hint_style == CAIRO_HINT_STYLE_SLIGHT ||
    1.18 ++		other->base.hint_style == CAIRO_HINT_STYLE_MEDIUM ||
    1.19 ++		other->base.hint_style == CAIRO_HINT_STYLE_FULL) {
    1.20 ++	options->base.hint_style = other->base.hint_style;
    1.21 ++	}
    1.22 + 
    1.23 +     if (options->base.antialias == CAIRO_ANTIALIAS_NONE) {
    1.24 + 	if (options->base.hint_style == CAIRO_HINT_STYLE_NONE)