[cairo-commit] cairo/src cairo-ft-font.c,1.72,1.73

[Owen Taylor]

Committed by: otaylor

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv28680/src

Modified Files:
	cairo-ft-font.c 
Log Message:
2005-07-21  Owen Taylor  <otaylor at redhat.com>

        * src/cairo-ft-font.c: The FT_LOAD_TARGET_* flags aren't separate
        bitfields, but rather an embedded subfield, so test with
        FT_LOAD_TARGET_MODE (val->key.flags) == FT_RENDER_LCD, and similar.


Index: cairo-ft-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ft-font.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- cairo-ft-font.c	21 Jul 2005 21:31:28 -0000	1.72
+++ cairo-ft-font.c	22 Jul 2005 01:12:21 -0000	1.73
@@ -837,8 +837,8 @@
 	/* Looks like fb handles zero-sized images just fine */
 	if ((val->key.flags & FT_LOAD_MONOCHROME) != 0)
 	    format = CAIRO_FORMAT_A8;
-	else if ((val->key.flags & 
-		  (FT_LOAD_TARGET_LCD | FT_LOAD_TARGET_LCD_V)) != 0)
+	else if (FT_LOAD_TARGET_MODE (val->key.flags) == FT_RENDER_MODE_LCD ||
+		 FT_LOAD_TARGET_MODE (val->key.flags) == FT_RENDER_MODE_LCD_V)
 	    format= CAIRO_FORMAT_ARGB32;
 	else
 	    format = CAIRO_FORMAT_A8;
@@ -858,9 +858,9 @@
 	    /* XXX not a complete set of flags. This code
 	     * will go away when cworth rewrites the glyph
 	     * cache code */
-	    if (val->key.flags & FT_LOAD_TARGET_LCD)
+	    if (FT_LOAD_TARGET_MODE (val->key.flags) == FT_RENDER_MODE_LCD)
 		rgba = FC_RGBA_RGB;
-	    else if (val->key.flags & FT_LOAD_TARGET_LCD_V)
+	    else if (FT_LOAD_TARGET_MODE (val->key.flags) == FT_RENDER_MODE_LCD_V)
 		rgba = FC_RGBA_VBGR;
 	
 	    switch (rgba) {