Attachment 80863 Details for Bug 104365

[patch] bugzilla-104365-cairo.patch

bugzilla-104365-cairo.patch (text/plain), 1.55 KB, created by Mike Fabian on 2006-04-28 17:06:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Fabian

Created: 2006-04-28 17:06:01 UTC

Size: 1.55 KB

patch

obsolete

>diff -ru cairo-1.0.2.orig/src/cairo-ft-font.c cairo-1.0.2/src/cairo-ft-font.c
>--- cairo-1.0.2.orig/src/cairo-ft-font.c	2005-10-03 22:44:42.000000000 +0200
>+++ cairo-1.0.2/src/cairo-ft-font.c	2006-04-28 18:43:54.000000000 +0200
>@@ -2384,16 +2384,12 @@
> 
>     if (options->antialias != CAIRO_ANTIALIAS_DEFAULT)
>     {
>-	if (FcPatternGet (pattern, FC_ANTIALIAS, 0, &v) == FcResultNoMatch)
>-	{
>+	    FcPatternDel (pattern, FC_ANTIALIAS);
> 	    FcPatternAddBool (pattern, FC_ANTIALIAS, options->antialias != CAIRO_ANTIALIAS_NONE);
>-	}
>     }
> 
>     if (options->antialias != CAIRO_ANTIALIAS_DEFAULT)
>     {
>-	if (FcPatternGet (pattern, FC_RGBA, 0, &v) == FcResultNoMatch)
>-	{
> 	    int rgba;
> 	    
> 	    if (options->antialias == CAIRO_ANTIALIAS_SUBPIXEL) {
>@@ -2416,20 +2412,16 @@
> 	    } else {
> 		rgba = FC_RGBA_NONE;
> 	    }
>-	    
>+	    FcPatternDel (pattern, FC_RGBA);
> 	    FcPatternAddInteger (pattern, FC_RGBA, rgba);
>-	}
>     }
> 
>     if (options->hint_style != CAIRO_HINT_STYLE_DEFAULT)
>     {
>-	if (FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch)
>-	{
>+	    FcPatternDel (pattern, FC_HINTING);
> 	    FcPatternAddBool (pattern, FC_HINTING, options->hint_style != CAIRO_HINT_STYLE_NONE);
>-	}
> 
> #ifdef FC_HINT_STYLE	
>-	if (FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch)
> 	{
> 	    int hint_style;
> 
>@@ -2445,7 +2437,8 @@
> 		hint_style = FC_HINT_FULL;
> 		break;
> 	    }
>-	    
>+
>+	    FcPatternDel (pattern, FC_HINT_STYLE);
> 	    FcPatternAddInteger (pattern, FC_HINT_STYLE, hint_style);
> 	}
> #endif	
>cairo-1.0.2/srcã ãã«çºè¦: cairo-ft-font.c.~1~

Actions: View | Diff

Attachments on bug 104365: 80863 | 80864 | 81424