[cairo-commit] cairo/src cairo-ft-font.c,1.107,1.108

[Owen Taylor]

Committed by: otaylor

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

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

        * src/cairo-ft-font.c (_cairo_ft_scaled_font_show_glyphs):
        when creating the temporary mask, do glyph ADD mask, not
        (glyph IN source) ADD mask. Set the mask as having component
        alpha when it's 4-channel.

        * test/text-antialias-subpixel.c test/Makefile.am: No longer XFAIL.

        * test/text-antialias-gray.c test/text-antialias-subpixel.c
        * test/text-antialias-none.c (draw): Don't turn off metrics
        hinting, it doesn't make sense.

        * test/text-antialias-*-ref.png: Update.


Index: cairo-ft-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ft-font.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- cairo-ft-font.c	23 Aug 2005 07:00:42 -0000	1.107
+++ cairo-ft-font.c	23 Aug 2005 20:34:15 -0000	1.108
@@ -2024,11 +2024,10 @@
 
 	_cairo_pattern_init_for_surface (&glyph_pattern, &(entries[i]->image->base));
 
-	status = _cairo_surface_composite (CAIRO_OPERATOR_ADD, pattern, 
-					   &glyph_pattern.base, 
+	status = _cairo_surface_composite (CAIRO_OPERATOR_ADD, &glyph_pattern.base,
+					   NULL,
 					   mask,
-					   x + entries[i]->size.x,
-					   y + entries[i]->size.y,
+					   0, 0,
 					   0, 0, 
 					   x + entries[i]->size.x - dest_x, 
 					   y + entries[i]->size.y - dest_y, 
@@ -2041,6 +2040,9 @@
 	    goto CLEANUP_MASK;
     }
 
+    if (mask_format == CAIRO_FORMAT_ARGB32)
+	pixman_image_set_component_alpha (((cairo_image_surface_t *)mask)->pixman_image, TRUE);
+      
     _cairo_pattern_init_for_surface (&mask_pattern, mask);
 
     status = _cairo_surface_composite (operator, pattern, &mask_pattern.base,