[cairo-commit] test/clip-disjoint-quad.c test/Makefile.sources test/reference

Chris Wilson ickle at kemper.freedesktop.org
Thu Sep 27 02:01:26 PDT 2012


 test/Makefile.sources                     |    1 
 test/clip-disjoint-quad.c                 |   83 ++++++++++++++++++++++++++++++
 test/reference/clip-disjoint-quad.ref.png |binary
 3 files changed, 84 insertions(+)

New commits:
commit 3969f2c687aa94721e02d50c2f9e1b4d62a546f7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Sep 27 09:56:36 2012 +0100

    test: Add clip-disjoint-quad
    
    Exercises a bug in the polygon intersection code demonstrated by Søren
    Sandmann.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/test/Makefile.sources b/test/Makefile.sources
index ca509ba..fdf262c 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -46,6 +46,7 @@ test_sources = \
 	clip-complex-shape.c				\
 	clip-disjoint.c					\
 	clip-disjoint-hatching.c			\
+	clip-disjoint-quad.c				\
 	clip-device-offset.c				\
 	clip-double-free.c				\
 	clip-draw-unbounded.c				\
diff --git a/test/clip-disjoint-quad.c b/test/clip-disjoint-quad.c
new file mode 100644
index 0000000..fe20381
--- /dev/null
+++ b/test/clip-disjoint-quad.c
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2012 Red Hat, Inc.
+ * Copyright © 2012 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: Soren Sandmann <sandmann at redhat.com>
+ *         Chris Wilson <chris at chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+#define WIDTH 100
+#define HEIGHT 200
+
+static void
+draw_quad (cairo_t *cr,
+	   double x1, double y1,
+	   double x2, double y2,
+	   double x3, double y3,
+	   double x4, double y4)
+{
+    cairo_move_to (cr, x1, y1);
+    cairo_line_to (cr, x2, y2);
+    cairo_line_to (cr, x3, y3);
+    cairo_line_to (cr, x4, y4);
+    cairo_close_path (cr);
+
+    cairo_set_source_rgb (cr, 0, 0.6, 0);
+    cairo_fill (cr);
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    int position[5] = {0, HEIGHT/2-10, HEIGHT/2-5, HEIGHT/2, HEIGHT-10 };
+    int i;
+
+    cairo_set_source_rgb (cr, 0, 0, 0);
+    cairo_paint (cr);
+
+    for (i = 0; i < 5; i++) {
+	cairo_reset_clip (cr);
+	cairo_set_source_rgb (cr, 1, 1, 1);
+	cairo_rectangle (cr, 0, 0, WIDTH/2, HEIGHT/2);
+	cairo_rectangle (cr, WIDTH/2, position[i], WIDTH/2, 10);
+	cairo_fill_preserve (cr);
+	cairo_clip (cr);
+
+	cairo_set_source_rgb (cr, 1, 0, 1);
+	draw_quad (cr, 50, 50, 75, 75, 50, 150, 25, 75);
+	cairo_fill (cr);
+
+	cairo_translate(cr, WIDTH, 0);
+    }
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (clip_disjoint_quad,
+	    "Tests a simple fill through two disjoint clips.",
+	    "clip, fill", /* keywords */
+	    NULL, /* requirements */
+	    5*WIDTH, HEIGHT,
+	    NULL, draw)
diff --git a/test/reference/clip-disjoint-quad.ref.png b/test/reference/clip-disjoint-quad.ref.png
new file mode 100644
index 0000000..de5ceb7
Binary files /dev/null and b/test/reference/clip-disjoint-quad.ref.png differ


More information about the cairo-commit mailing list