[cairo-commit] test/Makefile.am test/Makefile.sources test/unaligned-box.c test/unaligned-box.ref.png

Chris Wilson ickle at kemper.freedesktop.org
Wed Jun 1 10:10:11 PDT 2011


 test/Makefile.am           |    1 
 test/Makefile.sources      |    1 
 test/unaligned-box.c       |   73 +++++++++++++++++++++++++++++++++++++++++++++
 test/unaligned-box.ref.png |binary
 4 files changed, 75 insertions(+)

New commits:
commit 1b33552a6d9bb7ace2787522c3641736f2cc5ef4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 1 18:02:24 2011 +0100

    test: Add unaligned-box
    
    Test the handling of the various pixel-alignment boundary points of
    rectangles.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/test/Makefile.am b/test/Makefile.am
index 5b7dd4e..ebbc230 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1407,6 +1407,7 @@ REFERENCE_IMAGES = \
 	twin-antialias-subpixel.ref.png \
 	twin-antialias-subpixel.image16.ref.png \
 	twin-antialias-subpixel.xlib.ref.png \
+	unaligned-box.ref.png \
 	unantialiased-shapes.quartz.ref.png \
 	unantialiased-shapes.ref.png \
 	unbounded-operator.gl.argb32.xfail.png \
diff --git a/test/Makefile.sources b/test/Makefile.sources
index f241e51..5a0beb3 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -292,6 +292,7 @@ test_sources = \
 	twin-antialias-mixed.c				\
 	twin-antialias-none.c				\
 	twin-antialias-subpixel.c			\
+	unaligned-box.c				\
 	unantialiased-shapes.c				\
 	unbounded-operator.c				\
 	user-data.c					\
diff --git a/test/unaligned-box.c b/test/unaligned-box.c
new file mode 100644
index 0000000..5526919
--- /dev/null
+++ b/test/unaligned-box.c
@@ -0,0 +1,73 @@
+/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */
+/*
+ * Copyright 2011 Intel Corporation
+ *
+ * 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: Chris Wilson <chris at chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+#define WIDTH 48
+#define HEIGHT 52
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    int sx, sy;
+
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+    cairo_set_source_rgb (cr, 0, 0, 0);
+
+    cairo_translate(cr, 2, 2);
+
+    for (sx = 1; sx <= 4; sx++) {
+	cairo_save (cr);
+	for (sy = 1; sy <= 4; sy++) {
+	    cairo_rectangle (cr, 0, 0, sx, sy);
+	    cairo_fill (cr);
+
+	    cairo_rectangle (cr, sx + 1 + .5, 0, sx, sy);
+	    cairo_fill (cr);
+
+	    cairo_rectangle (cr, 0, sy + 1 + .5, sx, sy);
+	    cairo_fill (cr);
+
+	    cairo_rectangle (cr, sx + 1 + .5, sy + 1 + .5, sx-.5, sy-.5);
+	    cairo_fill (cr);
+
+	    cairo_translate (cr, 2*sx + 3, 0);
+	}
+	cairo_restore (cr);
+	cairo_translate (cr, 0, 2*sy + 3);
+    }
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (unaligned_box,
+	    "Tests handling of various boundary conditions for unaligned rectangles.",
+	    "fill", /* keywords */
+	    NULL, /* requirements */
+	    WIDTH, HEIGHT,
+	    NULL, draw)
diff --git a/test/unaligned-box.ref.png b/test/unaligned-box.ref.png
new file mode 100644
index 0000000..ec7c489
Binary files /dev/null and b/test/unaligned-box.ref.png differ


More information about the cairo-commit mailing list