diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-02-12 12:18:30 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-02-12 12:24:01 +0000 |
commit | 51047483f462a905567b42275ae061ead4df0a07 (patch) | |
tree | 39adb754e423d08acf777331a6020c4c51037216 | |
parent | 22b5f78c1c1ae7d289a99a3c52354bba3b9e817f (diff) |
test: Add clip-twice-rectangle
Jeff Muizeelar found another bug with clipping whereby the clip was
been incorrectly discarded.
-rw-r--r-- | test/Makefile.am | 1 | ||||
-rw-r--r-- | test/Makefile.sources | 1 | ||||
-rw-r--r-- | test/clip-twice-rectangle.c | 70 | ||||
-rw-r--r-- | test/clip-twice-rectangle.ref.png | bin | 0 -> 323 bytes |
4 files changed, 72 insertions, 0 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 10e322a1..a2cfb7d3 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -265,6 +265,7 @@ REFERENCE_IMAGES = \ clip-twice.test-paginated.rgb24.ref.png \ clip-twice.xlib.ref.png \ clip-twice.xlib.rgb24.ref.png \ + clip-twice-rectangle.ref.png \ clipped-group.pdf.ref.png \ clipped-group.ps2.ref.png \ clipped-group.ps3.ref.png \ diff --git a/test/Makefile.sources b/test/Makefile.sources index a8aa0e90..87c25a01 100644 --- a/test/Makefile.sources +++ b/test/Makefile.sources @@ -33,6 +33,7 @@ test_sources = \ clip-stroke-unbounded.c \ clip-text.c \ clip-twice.c \ + clip-twice-rectangle.c \ clip-unbounded.c \ clip-zero.c \ clipped-group.c \ diff --git a/test/clip-twice-rectangle.c b/test/clip-twice-rectangle.c new file mode 100644 index 00000000..28f16ec8 --- /dev/null +++ b/test/clip-twice-rectangle.c @@ -0,0 +1,70 @@ +/*
+ * Copyright © 2010 Mozilla Corporation
+ * Copyright © 2010 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@chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ cairo_surface_t *mask;
+ cairo_t *cr2;
+
+ cairo_set_source_rgb (cr, 0, 1, 0);
+ cairo_paint (cr);
+
+ /* clip twice, note that the intersection is smaller then the extents */
+ cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+ cairo_rectangle (cr, 10, 10, 80, 80);
+ cairo_rectangle (cr, 20, 20, 60, 60);
+ cairo_clip (cr);
+
+ cairo_rectangle (cr, 0, 40, 40, 30);
+ cairo_clip (cr);
+
+ /* and exercise the bug found by Jeff Muizelaar */
+ mask = cairo_surface_create_similar (cairo_get_target (cr),
+ CAIRO_CONTENT_ALPHA,
+ width-20, height-20);
+ cr2 = cairo_create (mask);
+ cairo_surface_destroy (mask);
+
+ cairo_set_source_rgba (cr2, 1, 1, 1, 1);
+ cairo_paint (cr2);
+
+ cairo_set_source_rgb (cr, 1, 0, 0);
+ cairo_mask_surface (cr, cairo_get_target (cr2), 0, 0);
+ cairo_destroy (cr2);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (clip_twice_rectangle,
+ "Tests clipping twice using rectangles",
+ "clip", /* keywords */
+ NULL, /* requirements */
+ 100, 100,
+ NULL, draw)
diff --git a/test/clip-twice-rectangle.ref.png b/test/clip-twice-rectangle.ref.png Binary files differnew file mode 100644 index 00000000..d0e65ead --- /dev/null +++ b/test/clip-twice-rectangle.ref.png |