[test] Add unbounded variants of clip-{fill,stroke}

Add a couple of tests to exercise a bug that Joonas spotted that I had
introduced with the clip-reduction scheme - namely that I had
incorrectly removed the clip on unbounded operations.

18 files changed, 223 insertions, 0 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 6b084e6e..f3e6536e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -179,6 +179,13 @@ REFERENCE_IMAGES = \
 	clip-fill-rule.rgb24.ref.png \
 	clip-fill-rule.test-paginated.rgb24.ref.png \
 	clip-fill-rule.xlib.rgb24.ref.png \
+	clip-fill-unbounded.argb32.ref.png \
+	clip-fill-unbounded.rgb24.ref.png \
+	clip-fill-unbounded.svg12.argb32.xfail.png \
+	clip-fill-unbounded.svg12.rgb24.xfail.png \
+	clip-fill-unbounded.xlib.argb32.ref.png \
+	clip-fill-unbounded.xlib.rgb24.ref.png \
+	clip-fill-unbounded.xlib-fallback.rgb24.ref.png \
 	clip-image.ref.png \
 	clip-nesting.pdf.argb32.ref.png \
 	clip-nesting.ps2.argb32.ref.png \
@@ -224,6 +231,13 @@ REFERENCE_IMAGES = \
 	clip-stroke.ref.png \
 	clip-stroke.xlib.ref.png \
 	clip-stroke.xlib-fallback.ref.png \
+	clip-stroke-unbounded.argb32.ref.png \
+	clip-stroke-unbounded.rgb24.ref.png \
+	clip-stroke-unbounded.svg12.argb32.xfail.png \
+	clip-stroke-unbounded.svg12.rgb24.xfail.png \
+	clip-stroke-unbounded.xlib.argb32.ref.png \
+	clip-stroke-unbounded.xlib.rgb24.ref.png \
+	clip-stroke-unbounded.xlib-fallback.rgb24.ref.png \
 	clip-text.ref.png \
 	clip-text.ps.xfail.png \
 	clip-text.svg.ref.png \
diff --git a/test/Makefile.sources b/test/Makefile.sources
index aec133f3..68672f5f 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -19,11 +19,13 @@ test_sources = \
 	clip-fill.c					\
 	clip-fill-rule.c				\
 	clip-fill-rule-pixel-aligned.c			\
+	clip-fill-unbounded.c				\
 	clip-image.c					\
 	clip-nesting.c					\
 	clip-operator.c					\
 	clip-push-group.c				\
 	clip-stroke.c					\
+	clip-stroke-unbounded.c				\
 	clip-text.c					\
 	clip-twice.c					\
 	clip-unbounded.c				\
diff --git a/test/clip-fill-unbounded.argb32.ref.png b/test/clip-fill-unbounded.argb32.ref.png
new file mode 100644
index 00000000..9adf992c
--- /dev/null
+++ b/test/clip-fill-unbounded.argb32.ref.png
diff --git a/test/clip-fill-unbounded.c b/test/clip-fill-unbounded.c
new file mode 100644
index 00000000..893eb41d
--- /dev/null
+++ b/test/clip-fill-unbounded.c
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2009 Chris Wilson
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Chris Wilson not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Chris Wilson makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL CHRIS WILSON BE LIABLE FOR ANY SPECIAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+#define WIDTH 40
+#define HEIGHT 40
+
+static void
+shapes (cairo_t *cr)
+{
+    cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+    cairo_set_source_rgb (cr, 1, 0, 0);
+    cairo_paint (cr);
+
+    cairo_set_operator (cr, CAIRO_OPERATOR_IN);
+    cairo_set_source_rgb (cr, 0, 0.7, 0);
+    cairo_new_sub_path (cr);
+    cairo_arc (cr, 10, 10, 8.5, 0, 2 * M_PI);
+    cairo_new_sub_path (cr);
+    cairo_arc_negative (cr, 10, 10, 6.5, 2 * M_PI, 0);
+    cairo_set_fill_rule (cr, CAIRO_FILL_RULE_WINDING);
+    cairo_fill (cr);
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+
+    cairo_translate (cr, 10, 10);
+
+    /* simple clip */
+    cairo_save (cr);
+    cairo_rectangle (cr, 0, 0, 20, 20);
+    cairo_clip (cr);
+    shapes (cr);
+    cairo_restore (cr);
+
+    cairo_translate (cr, WIDTH, 0);
+
+    /* unaligned clip */
+    cairo_save (cr);
+    cairo_rectangle (cr, 0.5, 0.5, 20, 20);
+    cairo_clip (cr);
+    shapes (cr);
+    cairo_restore (cr);
+
+    cairo_translate (cr, -WIDTH, HEIGHT);
+
+    /* aligned-clip */
+    cairo_save (cr);
+    cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+    cairo_rectangle (cr, 0, 0, 20, 20);
+    cairo_rectangle (cr, 3, 3, 10, 10);
+    cairo_rectangle (cr, 7, 7, 10, 10);
+    cairo_clip (cr);
+    shapes (cr);
+    cairo_restore (cr);
+
+    cairo_translate (cr, WIDTH, 0);
+
+    /* force a clip-mask */
+    cairo_save (cr);
+    cairo_arc (cr, 10, 10, 10, 0, 2 * M_PI);
+    cairo_new_sub_path (cr);
+    cairo_arc_negative (cr, 10, 10, 5, 2 * M_PI, 0);
+    cairo_new_sub_path (cr);
+    cairo_arc (cr, 10, 10, 2, 0, 2 * M_PI);
+    cairo_clip (cr);
+    shapes (cr);
+    cairo_restore (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (clip_fill_unbounded,
+	    "Tests unbounded fill through complex clips.",
+	    "clip, fill, unbounded", /* keywords */
+	    NULL, /* requirements */
+	    2 * WIDTH, 2* HEIGHT,
+	    NULL, draw)
diff --git a/test/clip-fill-unbounded.rgb24.ref.png b/test/clip-fill-unbounded.rgb24.ref.png
new file mode 100644
index 00000000..e57e2969
--- /dev/null
+++ b/test/clip-fill-unbounded.rgb24.ref.png
diff --git a/test/clip-fill-unbounded.svg12.argb32.xfail.png b/test/clip-fill-unbounded.svg12.argb32.xfail.png
new file mode 100644
index 00000000..32c760e9
--- /dev/null
+++ b/test/clip-fill-unbounded.svg12.argb32.xfail.png
diff --git a/test/clip-fill-unbounded.svg12.rgb24.xfail.png b/test/clip-fill-unbounded.svg12.rgb24.xfail.png
new file mode 100644
index 00000000..32c760e9
--- /dev/null
+++ b/test/clip-fill-unbounded.svg12.rgb24.xfail.png
diff --git a/test/clip-fill-unbounded.xlib-fallback.rgb24.ref.png b/test/clip-fill-unbounded.xlib-fallback.rgb24.ref.png
new file mode 100644
index 00000000..7fc229fd
--- /dev/null
+++ b/test/clip-fill-unbounded.xlib-fallback.rgb24.ref.png
diff --git a/test/clip-fill-unbounded.xlib.argb32.ref.png b/test/clip-fill-unbounded.xlib.argb32.ref.png
new file mode 100644
index 00000000..c7f4cb73
--- /dev/null
+++ b/test/clip-fill-unbounded.xlib.argb32.ref.png
diff --git a/test/clip-fill-unbounded.xlib.rgb24.ref.png b/test/clip-fill-unbounded.xlib.rgb24.ref.png
new file mode 100644
index 00000000..1da99928
--- /dev/null
+++ b/test/clip-fill-unbounded.xlib.rgb24.ref.png
diff --git a/test/clip-stroke-unbounded.argb32.ref.png b/test/clip-stroke-unbounded.argb32.ref.png
new file mode 100644
index 00000000..39b9a301
--- /dev/null
+++ b/test/clip-stroke-unbounded.argb32.ref.png
diff --git a/test/clip-stroke-unbounded.c b/test/clip-stroke-unbounded.c
new file mode 100644
index 00000000..990b618e
--- /dev/null
+++ b/test/clip-stroke-unbounded.c
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2009 Chris Wilson
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Chris Wilson not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Chris Wilson makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL CHRIS WILSON BE LIABLE FOR ANY SPECIAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+#define WIDTH 40
+#define HEIGHT 40
+
+static void
+shapes (cairo_t *cr)
+{
+    cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+    cairo_set_source_rgb (cr, 1, 0, 0);
+    cairo_paint (cr);
+
+    cairo_set_operator (cr, CAIRO_OPERATOR_IN);
+    cairo_set_source_rgb (cr, 0, 0.7, 0);
+    cairo_arc (cr, 10, 10, 7.5, 0, 2 * M_PI);
+    cairo_stroke (cr);
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+
+    cairo_translate (cr, 10, 10);
+
+    /* simple clip */
+    cairo_save (cr);
+    cairo_rectangle (cr, 0, 0, 20, 20);
+    cairo_clip (cr);
+    shapes (cr);
+    cairo_restore (cr);
+
+    cairo_translate (cr, WIDTH, 0);
+
+    /* unaligned clip */
+    cairo_save (cr);
+    cairo_rectangle (cr, 0.5, 0.5, 20, 20);
+    cairo_clip (cr);
+    shapes (cr);
+    cairo_restore (cr);
+
+    cairo_translate (cr, -WIDTH, HEIGHT);
+
+    /* aligned-clip */
+    cairo_save (cr);
+    cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+    cairo_rectangle (cr, 0, 0, 20, 20);
+    cairo_rectangle (cr, 3, 3, 10, 10);
+    cairo_rectangle (cr, 7, 7, 10, 10);
+    cairo_clip (cr);
+    shapes (cr);
+    cairo_restore (cr);
+
+    cairo_translate (cr, WIDTH, 0);
+
+    /* force a clip-mask */
+    cairo_save (cr);
+    cairo_arc (cr, 10, 10, 10, 0, 2 * M_PI);
+    cairo_new_sub_path (cr);
+    cairo_arc_negative (cr, 10, 10, 5, 2 * M_PI, 0);
+    cairo_new_sub_path (cr);
+    cairo_arc (cr, 10, 10, 2, 0, 2 * M_PI);
+    cairo_clip (cr);
+    shapes (cr);
+    cairo_restore (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (clip_stroke_unbounded,
+	    "Tests unbounded stroke through complex clips.",
+	    "clip, stroke, unbounded", /* keywords */
+	    NULL, /* requirements */
+	    2 * WIDTH, 2* HEIGHT,
+	    NULL, draw)
+
diff --git a/test/clip-stroke-unbounded.rgb24.ref.png b/test/clip-stroke-unbounded.rgb24.ref.png
new file mode 100644
index 00000000..a30352eb
--- /dev/null
+++ b/test/clip-stroke-unbounded.rgb24.ref.png
diff --git a/test/clip-stroke-unbounded.svg12.argb32.xfail.png b/test/clip-stroke-unbounded.svg12.argb32.xfail.png
new file mode 100644
index 00000000..6e7b48dc
--- /dev/null
+++ b/test/clip-stroke-unbounded.svg12.argb32.xfail.png
diff --git a/test/clip-stroke-unbounded.svg12.rgb24.xfail.png b/test/clip-stroke-unbounded.svg12.rgb24.xfail.png
new file mode 100644
index 00000000..6e7b48dc
--- /dev/null
+++ b/test/clip-stroke-unbounded.svg12.rgb24.xfail.png
diff --git a/test/clip-stroke-unbounded.xlib-fallback.rgb24.ref.png b/test/clip-stroke-unbounded.xlib-fallback.rgb24.ref.png
new file mode 100644
index 00000000..7fc229fd
--- /dev/null
+++ b/test/clip-stroke-unbounded.xlib-fallback.rgb24.ref.png
diff --git a/test/clip-stroke-unbounded.xlib.argb32.ref.png b/test/clip-stroke-unbounded.xlib.argb32.ref.png
new file mode 100644
index 00000000..f94e716e
--- /dev/null
+++ b/test/clip-stroke-unbounded.xlib.argb32.ref.png
diff --git a/test/clip-stroke-unbounded.xlib.rgb24.ref.png b/test/clip-stroke-unbounded.xlib.rgb24.ref.png
new file mode 100644
index 00000000..1da99928
--- /dev/null
+++ b/test/clip-stroke-unbounded.xlib.rgb24.ref.png