[cairo-commit] cairo/test Makefile.am, 1.88, 1.89 text-antialias-gray-ref.png, 1.1, 1.2 text-antialias-gray.c, 1.1, 1.2 text-antialias-none-ref.png, 1.1, 1.2 text-antialias-none.c, 1.2, 1.3 text-antialias-subpixel-ref.png, 1.2, 1.3 text-antialias-subpixel.c, 1.2, 1.3

[Owen Taylor]

Committed by: otaylor

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

Modified Files:
	Makefile.am text-antialias-gray-ref.png text-antialias-gray.c 
	text-antialias-none-ref.png text-antialias-none.c 
	text-antialias-subpixel-ref.png text-antialias-subpixel.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: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/test/Makefile.am,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- Makefile.am	23 Aug 2005 17:39:27 -0000	1.88
+++ Makefile.am	23 Aug 2005 20:34:15 -0000	1.89
@@ -141,7 +141,6 @@
 filter-nearest-offset		\
 pixman-rotate			\
 self-intersecting		\
-text-antialias-subpixel		\
 text-rotate
 
 check_PROGRAMS = $(TESTS)

Index: text-antialias-gray-ref.png
===================================================================
RCS file: /cvs/cairo/cairo/test/text-antialias-gray-ref.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsLxprlB and /tmp/cvsRRnwgL differ

Index: text-antialias-gray.c
===================================================================
RCS file: /cvs/cairo/cairo/test/text-antialias-gray.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- text-antialias-gray.c	27 Jul 2005 20:28:15 -0000	1.1
+++ text-antialias-gray.c	23 Aug 2005 20:34:15 -0000	1.2
@@ -50,7 +50,6 @@
     font_options = cairo_font_options_create ();
 
     cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_NONE);
-    cairo_font_options_set_hint_metrics (font_options, CAIRO_HINT_METRICS_OFF);
     cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_GRAY);
 
     cairo_set_font_options (cr, font_options);

Index: text-antialias-none-ref.png
===================================================================
RCS file: /cvs/cairo/cairo/test/text-antialias-none-ref.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvshErGdD and /tmp/cvsnQNFdN differ

Index: text-antialias-none.c
===================================================================
RCS file: /cvs/cairo/cairo/test/text-antialias-none.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- text-antialias-none.c	28 Jul 2005 02:13:39 -0000	1.2
+++ text-antialias-none.c	23 Aug 2005 20:34:15 -0000	1.3
@@ -50,7 +50,6 @@
     font_options = cairo_font_options_create ();
 
     cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_NONE);
-    cairo_font_options_set_hint_metrics (font_options, CAIRO_HINT_METRICS_OFF);
     cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_NONE);
 
     cairo_set_font_options (cr, font_options);

Index: text-antialias-subpixel-ref.png
===================================================================
RCS file: /cvs/cairo/cairo/test/text-antialias-subpixel-ref.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsjgzCtH and /tmp/cvshZmsyR differ

Index: text-antialias-subpixel.c
===================================================================
RCS file: /cvs/cairo/cairo/test/text-antialias-subpixel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- text-antialias-subpixel.c	23 Aug 2005 17:39:27 -0000	1.2
+++ text-antialias-subpixel.c	23 Aug 2005 20:34:15 -0000	1.3
@@ -57,7 +57,6 @@
     font_options = cairo_font_options_create ();
 
     cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_NONE);
-    cairo_font_options_set_hint_metrics (font_options, CAIRO_HINT_METRICS_OFF);
     cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_SUBPIXEL);
     cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_RGB);
     cairo_set_font_options (cr, font_options);
@@ -80,6 +79,5 @@
 int
 main (void)
 {
-    return cairo_test_expect_failure (&test, draw,
-	"Subpixel-antialiased text is not working with the image backend.");
+    return cairo_test (&test, draw);
 }