[cairo-commit] test/Makefile.am test/Makefile.sources test/subsurface-image-repeat.c test/subsurface-image-repeat.image16.ref.png test/subsurface-image-repeat.ref.png

Chris Wilson ickle at kemper.freedesktop.org
Thu May 6 02:55:44 PDT 2010


 test/Makefile.am                             |    2 
 test/Makefile.sources                        |    1 
 test/subsurface-image-repeat.c               |   70 +++++++++++++++++++++++++++
 test/subsurface-image-repeat.image16.ref.png |binary
 test/subsurface-image-repeat.ref.png         |binary
 5 files changed, 73 insertions(+)

New commits:
commit bf83bf00a75343f7d1dcd15dc4eeec1b1a4b9428
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 6 10:53:48 2010 +0100

    test: Add subsurface-image-repeat
    
    Test handling of source clipping with an image - principally to check
    handling of mime types and zero-copy image snapshotting in the vector
    surfaces and ensure that they work with subsurface patterns as well.

diff --git a/test/Makefile.am b/test/Makefile.am
index fcdb403..72023a0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1081,6 +1081,8 @@ REFERENCE_IMAGES = \
 	subsurface.image16.ref.png \
 	subsurface-reflect.ref.png \
 	subsurface-repeat.ref.png \
+	subsurface-image-repeat.ref.png \
+	subsurface-image-repeat.image16.ref.png \
 	subsurface-pad.ref.png \
 	subsurface-modify-child.ref.png \
 	subsurface-modify-parent.ref.png \
diff --git a/test/Makefile.sources b/test/Makefile.sources
index de83e2e..01043c6 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -228,6 +228,7 @@ test_sources = \
 	source-surface-scale-paint.c			\
 	spline-decomposition.c				\
 	subsurface.c                                    \
+	subsurface-image-repeat.c                       \
 	subsurface-repeat.c                             \
 	subsurface-reflect.c                            \
 	subsurface-pad.c                                \
diff --git a/test/subsurface-image-repeat.c b/test/subsurface-image-repeat.c
new file mode 100644
index 0000000..d58dd92
--- /dev/null
+++ b/test/subsurface-image-repeat.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2009 Intel Corporation
+ *
+ * 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
+ * Intel not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Intel makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * INTEL CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL INTEL CORPORATION 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 at chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+static const char *png_filename = "romedalen.png";
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    const cairo_test_context_t *ctx = cairo_test_get_context (cr);
+    cairo_surface_t *image, *region;
+    cairo_t *cr_region;
+
+    cairo_set_source_rgb (cr, .5, .5, .5);
+    cairo_paint (cr);
+
+    /* fill the centre */
+    region = cairo_surface_create_for_rectangle (cairo_get_target (cr),
+						 20, 20, 20, 20);
+    cr_region = cairo_create (region);
+    cairo_surface_destroy (region);
+
+    image = cairo_test_create_surface_from_png (ctx, png_filename);
+    cairo_set_source_surface (cr_region, image,
+			      10 - cairo_image_surface_get_width (image)/2,
+			      10 - cairo_image_surface_get_height (image)/2);
+    cairo_paint (cr_region);
+    cairo_surface_destroy (image);
+
+    cairo_set_source_surface (cr, cairo_get_target (cr_region), 20, 20);
+    cairo_destroy (cr_region);
+
+    /* repeat the pattern around the outside, but do not overwrite...*/
+    cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+    cairo_rectangle (cr, 0, 0, width, height);
+    cairo_rectangle (cr, 20, 40, 20, -20);
+    cairo_fill (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (subsurface_image_repeat,
+	    "Tests source (image) clipping with repeat",
+	    "subsurface, image, repeat", /* keywords */
+	    NULL, /* requirements */
+	    60, 60,
+	    NULL, draw)
diff --git a/test/subsurface-image-repeat.image16.ref.png b/test/subsurface-image-repeat.image16.ref.png
new file mode 100644
index 0000000..a62f210
Binary files /dev/null and b/test/subsurface-image-repeat.image16.ref.png differ
diff --git a/test/subsurface-image-repeat.ref.png b/test/subsurface-image-repeat.ref.png
new file mode 100644
index 0000000..3dd6306
Binary files /dev/null and b/test/subsurface-image-repeat.ref.png differ


More information about the cairo-commit mailing list