[cairo-commit] test/Makefile.sources test/reference test/stride-12-image.c

[Andrea Canciani]

 test/Makefile.sources                          |    1 
 test/reference/stride-12-image.image16.ref.png |binary
 test/reference/stride-12-image.ps.ref.png      |binary
 test/reference/stride-12-image.ref.png         |binary
 test/stride-12-image.c                         |   71 +++++++++++++++++++++++++
 5 files changed, 72 insertions(+)

New commits:
commit 2bb441fd11ba494b3a750f6412d21b720e4b5a3d
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Thu Jan 12 14:29:50 2012 +0100

    test: Add stride-12-image
    
    Add a test to check that all the backends can handle images with a
    stride that is not width * 4.

diff --git a/test/Makefile.sources b/test/Makefile.sources
index a76f37f..6079ce3 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -302,6 +302,7 @@ test_sources = \
 	source-clip-scale.c				\
 	source-surface-scale-paint.c			\
 	spline-decomposition.c				\
+	stride-12-image.c				\
 	stroke-pattern.c                                \
 	subsurface.c                                    \
 	subsurface-image-repeat.c                       \
diff --git a/test/reference/stride-12-image.image16.ref.png b/test/reference/stride-12-image.image16.ref.png
new file mode 100644
index 0000000..4b15914
Binary files /dev/null and b/test/reference/stride-12-image.image16.ref.png differ
diff --git a/test/reference/stride-12-image.ps.ref.png b/test/reference/stride-12-image.ps.ref.png
new file mode 100644
index 0000000..953c9a1
Binary files /dev/null and b/test/reference/stride-12-image.ps.ref.png differ
diff --git a/test/reference/stride-12-image.ref.png b/test/reference/stride-12-image.ref.png
new file mode 100644
index 0000000..4428456
Binary files /dev/null and b/test/reference/stride-12-image.ref.png differ
diff --git a/test/stride-12-image.c b/test/stride-12-image.c
new file mode 100644
index 0000000..21bd8b0
--- /dev/null
+++ b/test/stride-12-image.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2012 Andrea Canciani
+ *
+ * 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: Andrea Canciani <ranma42 at gmail.com>
+ */
+
+#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_format_t format = CAIRO_FORMAT_ARGB32;
+    cairo_t *cr_src;
+    cairo_surface_t *png, *src;
+    uint8_t *data;
+    int stride;
+
+    png = cairo_test_create_surface_from_png (ctx, png_filename);
+
+    stride = cairo_format_stride_for_width (format, width) + 12;
+    data = calloc (stride, height);
+    src = cairo_image_surface_create_for_data (data, format,
+					       width, height, stride);
+
+    cr_src = cairo_create (src);
+    cairo_set_source_surface (cr_src, png, 0, 0);
+    cairo_paint (cr_src);
+    cairo_destroy (cr_src);
+
+    cairo_set_source_surface (cr, src, 0, 0);
+    cairo_paint (cr);
+
+    cairo_surface_destroy (png);
+
+    cairo_surface_finish (src);
+    cairo_surface_destroy (src);
+
+    free (data);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (stride_12_image,
+	    "Test that images with a non-default stride are handled correctly.",
+	    "stride, image", /* keywords */
+	    NULL, /* requirements */
+	    256, 192,
+	    NULL, draw)