[test/extend-*] Add various cairo_pattern_set_extend() test cases.

Add various test cases to exercise
_cairo_pattern_acquire_surface_for_surface(), most notably using similar
source surfaces to provide coverage of the non-image surface branch.

test/.gitignore

@@ -43,7 +43,11 @@ degenerate-pen
 device-offset
 device-offset-positive
 extend-pad
+extend-pad-similar
 extend-reflect
+extend-reflect-similar
+extend-repeat
+extend-repeat-similar
 fallback-resolution
 fallback-resolution.pdf
 fallback-resolution.ps

test/Makefile.am

@@ -36,6 +36,11 @@ degenerate-pen$(EXEEXT)					\
 device-offset$(EXEEXT)					\
 device-offset-positive$(EXEEXT)				\
 extend-pad$(EXEEXT)					\
+extend-pad-similar$(EXEEXT)				\
+extend-reflect$(EXEEXT)					\
+extend-reflect-similar$(EXEEXT)				\
+extend-repeat$(EXEEXT)					\
+extend-repeat-similar$(EXEEXT)				\
 fill-and-stroke$(EXEEXT)				\
 fill-and-stroke-alpha$(EXEEXT)				\
 fill-and-stroke-alpha-add$(EXEEXT)			\
@@ -169,7 +174,6 @@ zero-alpha$(EXEEXT)
 #	that's just a bug in the test rig that should just consider
 #	the abort an XFAIL like any other.
 DISABLED_TESTS =			\
-extend-reflect$(EXEEXT)			\
 show-glyphs-many$(EXEEXT)		\
 text-glyph-range$(EXEEXT)
 
@@ -290,7 +294,11 @@ REFERENCE_IMAGES = \
 	device-offset-ref.png	\
 	device-offset-rgb24-ref.png	\
 	extend-pad-ref.png	\
+	extend-pad-similar-ref.png	\
 	extend-reflect-ref.png	\
+	extend-reflect-similar-ref.png	\
+	extend-repeat-ref.png	\
+	extend-repeat-similar-ref.png	\
 	fill-and-stroke-alpha-add-quartz-ref.png	\
 	fill-and-stroke-alpha-add-ref.png	\
 	fill-and-stroke-alpha-quartz-ref.png	\
@@ -514,6 +522,7 @@ XFAIL_TESTS =					\
 a8-mask$(EXEEXT)				\
 big-trap$(EXEEXT)				\
 extend-pad$(EXEEXT)				\
+extend-pad-similar$(EXEEXT)			\
 filter-nearest-offset$(EXEEXT)			\
 long-lines$(EXEEXT)				\
 self-intersecting$(EXEEXT)			\

test/cairo-test.c

@@ -701,8 +701,6 @@ cairo_test_create_surface_from_png (const char *filename)
 	    image = cairo_image_surface_create_from_png (srcdir_filename);
 	    free (srcdir_filename);
 	}
-	if (cairo_surface_status(image))
-	    return NULL;
     }
 
     return image;

test/extend-pad-similar.c

@@ -0,0 +1,105 @@
+/*
+ * Copyright © 2007 Red Hat, Inc.
+ *
+ * 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: Behdad Esfahbod <behdad@behdad.org>
+ */
+
+#include "cairo-test.h"
+
+#define SIZE 90
+
+static cairo_test_draw_function_t draw;
+
+cairo_test_t test = {
+    "extend-pad-similar",
+    "Test CAIRO_EXTEND_PAD for surface patterns",
+    SIZE, SIZE,
+    draw
+};
+
+static cairo_surface_t *
+create_source_surface (cairo_surface_t *target)
+{
+    const int surface_size = (SIZE - 30) / 10;
+    cairo_surface_t *surface;
+    cairo_t *cr;
+
+    /* Create an image surface with my favorite four colors in each
+     * quadrant. */
+    surface = cairo_surface_create_similar (target, CAIRO_CONTENT_COLOR,
+					    surface_size, surface_size);
+    cr = cairo_create (surface);
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_rectangle (cr,
+		     0, 0,
+		     surface_size / 2, surface_size / 2);
+    cairo_fill (cr);
+    cairo_set_source_rgb (cr, 1, 0, 0);
+    cairo_rectangle (cr,
+		     surface_size / 2, 0,
+		     surface_size / 2, surface_size / 2);
+    cairo_fill (cr);
+    cairo_set_source_rgb (cr, 0, 1, 0);
+    cairo_rectangle (cr,
+		     0, surface_size / 2,
+		     surface_size / 2, surface_size / 2);
+    cairo_fill (cr);
+    cairo_set_source_rgb (cr, 0, 0, 1);
+    cairo_rectangle (cr,
+		     surface_size / 2, surface_size / 2,
+		     surface_size / 2, surface_size / 2);
+    cairo_fill (cr);
+    cairo_destroy (cr);
+
+    return surface;
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_surface_t *surface;
+
+    surface = create_source_surface (cairo_get_group_target (cr));
+
+    cairo_set_source_rgba (cr, 0, 0, 0, 1);
+    cairo_rectangle (cr, 0, 0, SIZE, SIZE);
+    cairo_fill (cr);
+
+    cairo_scale (cr, 10, 10);
+    cairo_set_source_surface (cr, surface, 1.5, 1.5);
+    cairo_surface_destroy (surface);
+
+    cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_PAD);
+    cairo_rectangle (cr, 1.5, 1.5, 6, 6);
+    cairo_clip (cr);
+
+    cairo_paint (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test (&test);
+}

test/extend-reflect-similar.c

@@ -0,0 +1,56 @@
+#include "cairo-test.h"
+
+const char	png_filename[]	= "romedalen.png";
+
+static cairo_test_draw_function_t draw;
+
+cairo_test_t test = {
+    "extend-reflect-similar",
+    "Test CAIRO_EXTEND_REFLECT for surface patterns",
+    256 + 32*2, 192 + 32*2,
+    draw
+};
+
+static cairo_surface_t *
+clone_similar_surface (cairo_surface_t * target, cairo_surface_t *surface)
+{
+    cairo_t *cr;
+    cairo_surface_t *similar;
+
+    similar = cairo_surface_create_similar (target,
+	                              cairo_surface_get_content (surface),
+				      cairo_image_surface_get_width (surface),
+				      cairo_image_surface_get_height (surface));
+    cr = cairo_create (similar);
+    cairo_set_source_surface (cr, surface, 0, 0);
+    cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+    cairo_paint (cr);
+    cairo_destroy (cr);
+
+    return similar;
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_surface_t *surface;
+    cairo_surface_t *similar;
+
+    surface = cairo_test_create_surface_from_png (png_filename);
+    similar = clone_similar_surface (cairo_get_group_target (cr), surface);
+    cairo_set_source_surface (cr, similar, 32, 32);
+    cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REFLECT);
+
+    cairo_paint (cr);
+
+    cairo_surface_destroy (similar);
+    cairo_surface_destroy (surface);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test (&test);
+}

test/extend-reflect.c

@@ -24,6 +24,8 @@ draw (cairo_t *cr, int width, int height)
 
     cairo_paint (cr);
 
+    cairo_surface_destroy (surface);
+
     return CAIRO_TEST_SUCCESS;
 }
 

test/extend-repeat-similar.c

@@ -0,0 +1,56 @@
+#include "cairo-test.h"
+
+const char	png_filename[]	= "romedalen.png";
+
+static cairo_test_draw_function_t draw;
+
+cairo_test_t test = {
+    "extend-repeat-similar",
+    "Test CAIRO_EXTEND_REPEAT for surface patterns",
+    256 + 32*2, 192 + 32*2,
+    draw
+};
+
+static cairo_surface_t *
+clone_similar_surface (cairo_surface_t * target, cairo_surface_t *surface)
+{
+    cairo_t *cr;
+    cairo_surface_t *similar;
+
+    similar = cairo_surface_create_similar (target,
+	                              cairo_surface_get_content (surface),
+				      cairo_image_surface_get_width (surface),
+				      cairo_image_surface_get_height (surface));
+    cr = cairo_create (similar);
+    cairo_set_source_surface (cr, surface, 0, 0);
+    cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+    cairo_paint (cr);
+    cairo_destroy (cr);
+
+    return similar;
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_surface_t *surface;
+    cairo_surface_t *similar;
+
+    surface = cairo_test_create_surface_from_png (png_filename);
+    similar = clone_similar_surface (cairo_get_group_target (cr), surface);
+    cairo_set_source_surface (cr, similar, 32, 32);
+    cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+
+    cairo_paint (cr);
+
+    cairo_surface_destroy (similar);
+    cairo_surface_destroy (surface);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test (&test);
+}

test/extend-repeat.c

@@ -0,0 +1,34 @@
+#include "cairo-test.h"
+
+const char	png_filename[]	= "romedalen.png";
+
+static cairo_test_draw_function_t draw;
+
+cairo_test_t test = {
+    "extend-repeat",
+    "Test CAIRO_EXTEND_REPEAT for surface patterns",
+    256 + 32*2, 192 + 32*2,
+    draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_surface_t *surface;
+
+    surface = cairo_test_create_surface_from_png (png_filename);
+    cairo_set_source_surface (cr, surface, 32, 32);
+    cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+
+    cairo_paint (cr);
+
+    cairo_surface_destroy (surface);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test (&test);
+}