[cairo-commit] 2 commits - src/cairo-pattern.c test/gradient-zero-stops-mask.argb32.ref.png test/gradient-zero-stops-mask.c test/gradient-zero-stops-mask.rgb24.ref.png test/Makefile.am test/Makefile.sources

[Andrea Canciani]

 src/cairo-pattern.c                          |    3 +
 test/Makefile.am                             |    2 
 test/Makefile.sources                        |    1 
 test/gradient-zero-stops-mask.argb32.ref.png |binary
 test/gradient-zero-stops-mask.c              |   59 +++++++++++++++++++++++++++
 test/gradient-zero-stops-mask.rgb24.ref.png  |binary
 6 files changed, 65 insertions(+)

New commits:
commit 35f19bc084792bbad42b86a399103ebfbf407d05
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Wed Mar 31 12:18:01 2010 +0200

    pattern: Fix _gradient_is_opaque() for zero stops
    
    _gradient_is_opaque() previously returned TRUE for gradient with
    no stops, triggering a false optimization in _cairo_gstate_mask().
    
    Fixes test/gradient-zero-stops-mask
    
    Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index a1c8162..8ae4b81 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -1795,6 +1795,9 @@ _gradient_is_opaque (const cairo_gradient_pattern_t *gradient)
 {
     unsigned int i;
 
+    if (gradient->n_stops == 0)
+	return FALSE;
+
     for (i = 0; i < gradient->n_stops; i++)
 	if (! CAIRO_COLOR_IS_OPAQUE (&gradient->stops[i].color))
 	    return FALSE;
commit 01e182194224e0eb7493b2ae3c8367ed455cfd54
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Wed Mar 31 12:14:25 2010 +0200

    test: Add gradient-zero-stops-mask
    
    Add a test to check that gradient with no stops are not considered
    opaque by gstate (and thus masking with them is not optimized to
    paint).

diff --git a/test/Makefile.am b/test/Makefile.am
index 7d4e70a..62c36ba 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -540,6 +540,8 @@ REFERENCE_IMAGES = \
 	gradient-constant-alpha.rgb24.ref.png \
 	gradient-zero-stops.ref.png \
 	gradient-zero-stops.rgb24.ref.png \
+	gradient-zero-stops-mask.argb32.ref.png \
+	gradient-zero-stops-mask.rgb24.ref.png \
 	group-clip.ref.png \
 	group-paint.ref.png \
 	group-unaligned.pdf.new.png \
diff --git a/test/Makefile.sources b/test/Makefile.sources
index bef7529..2397824 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -106,6 +106,7 @@ test_sources = \
 	gradient-alpha.c				\
 	gradient-constant-alpha.c			\
 	gradient-zero-stops.c				\
+	gradient-zero-stops-mask.c			\
 	group-clip.c					\
 	group-paint.c					\
 	group-unaligned.c				\
diff --git a/test/gradient-zero-stops-mask.argb32.ref.png b/test/gradient-zero-stops-mask.argb32.ref.png
new file mode 100644
index 0000000..0a50f4c
Binary files /dev/null and b/test/gradient-zero-stops-mask.argb32.ref.png differ
diff --git a/test/gradient-zero-stops-mask.c b/test/gradient-zero-stops-mask.c
new file mode 100644
index 0000000..b2a10ec
--- /dev/null
+++ b/test/gradient-zero-stops-mask.c
@@ -0,0 +1,59 @@
+/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */
+/*
+ * Copyright © 2007 Brian Ewins
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author: Brian Ewins <Brian.Ewins at gmail.com>
+ * Contributor(s):
+ *      Andrea Canciani <ranma42 at gmail.com>
+ */
+
+#include "cairo-test.h"
+
+/* This test case is designed to exercise the opaque test for
+ * gradients with no stop.
+ */
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_pattern_t *pat;
+
+    cairo_set_source_rgb (cr, 1., 0., 0.);
+
+    pat = cairo_pattern_create_linear (0., 0., 1., 1.);
+    cairo_mask (cr, pat);
+    cairo_pattern_destroy (pat);
+
+    pat = cairo_pattern_create_radial (0., 0., 0., 1., 1., 1.);
+    cairo_mask (cr, pat);
+    cairo_pattern_destroy (pat);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (gradient_zero_stops_mask,
+	    "Verifies that gradients with no stops are considered clear.",
+	    "gradient", /* keywords */
+	    NULL, /* requirements */
+	    2, 2,
+	    NULL, draw)
diff --git a/test/gradient-zero-stops-mask.rgb24.ref.png b/test/gradient-zero-stops-mask.rgb24.ref.png
new file mode 100644
index 0000000..21465ce
Binary files /dev/null and b/test/gradient-zero-stops-mask.rgb24.ref.png differ