[cairo-commit] cairo/test Makefile.am, 1.44, 1.45 coverage-ref.png, 1.8, NONE coverage.c, 1.7, NONE mask-ref.png, 1.1, 1.2 mask.c, 1.1, 1.2

[Owen Taylor]

Committed by: otaylor

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

Modified Files:
	Makefile.am mask-ref.png mask.c 
Removed Files:
	coverage-ref.png coverage.c 
Log Message:
2005-05-05  Owen Taylor  <otaylor at redhat.com>

        * src/cairo.[ch] doc/public/cairo-sections.txt: Add
        cairo_paint_with_alpha().

        * src/cairo-pattern.c (_cairo_pattern_acquire_surfaces): Fix
        segfault when mask == NULL.

        * test/mask.c test/mask-ref.png: Add testing of cairo_paint_with_alpha().

        * test/coverage.c test/coverage-ref.png: Remove ... it's not testing
        anything that mask doesn't test better.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/test/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- Makefile.am	3 May 2005 15:33:32 -0000	1.44
+++ Makefile.am	6 May 2005 19:00:22 -0000	1.45
@@ -2,7 +2,6 @@
 TESTS = 			\
 clip-nesting			\
 clip-twice			\
-coverage			\
 create-for-png			\
 fill-and-stroke			\
 fill-rule			\
@@ -40,7 +39,6 @@
 EXTRA_DIST =				\
 clip-nesting-ref.png			\
 clip-twice-ref.png			\
-coverage-ref.png			\
 create-for-png-ref.png			\
 fill-and-stroke-ref.png			\
 fill-rule-ref.png			\
@@ -80,7 +78,6 @@
 # Also, any test listed here should call cairo_test_expect_failure and
 # provide an explanation for the expected failure.
 XFAIL_TESTS =			\
-coverage			\
 filter-nearest-offset		\
 pixman-rotate			\
 self-copy			\
@@ -116,7 +113,6 @@
 # from autogen.sh. My, but this is painful...
 clip_nesting_LDADD = $(LDADDS)
 clip_twice_LDADD = $(LDADDS)
-coverage_LDADD = $(LDADDS)
 create_for_png_LDADD = $(LDADDS)
 fill_and_stroke_LDADD = $(LDADDS)
 fill_rule_LDADD = $(LDADDS)

--- coverage-ref.png DELETED ---

--- coverage.c DELETED ---

Index: mask-ref.png
===================================================================
RCS file: /cvs/cairo/cairo/test/mask-ref.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsrARtGr and /tmp/cvsk6HibM differ

Index: mask.c
===================================================================
RCS file: /cvs/cairo/cairo/test/mask.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mask.c	2 May 2005 18:01:18 -0000	1.1
+++ mask.c	6 May 2005 19:00:22 -0000	1.2
@@ -105,6 +105,12 @@
 }
 
 static void
+mask_alpha (cairo_t *cr, int x, int y)
+{
+    cairo_paint_with_alpha (cr, 0.75);
+}
+
+static void
 mask_gradient (cairo_t *cr, int x, int y)
 {
     cairo_pattern_t *pattern;
@@ -158,6 +164,7 @@
 };
 
 static void (*mask_funcs[])(cairo_t *cr, int x, int y) = {
+    mask_alpha,
     mask_gradient,
     mask_polygon,
 };