diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-08-27 17:25:08 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-08-29 17:07:39 +0100 |
commit | 52e5ce3a36ab1cd7da25056df7f12ac0b23e410d (patch) | |
tree | 4ddcb619ae235e70eb01eccd410e2a6307386fb8 /test | |
parent | 20cdb99ae8ae0cc02193468e811b1b74b3f6d3b7 (diff) |
[test] Add clip-stroke
Soeren was the first to report a clipping regression in the xlib backend
with strokes, and provided a test case to exercise the bug. This is an
extension of his test to provide coverage of different clipping and
stroking methods.
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile.am | 3 | ||||
-rw-r--r-- | test/Makefile.sources | 1 | ||||
-rw-r--r-- | test/clip-stroke.c | 121 | ||||
-rw-r--r-- | test/clip-stroke.ref.png | bin | 0 -> 1528 bytes | |||
-rw-r--r-- | test/clip-stroke.xlib-fallback.ref.png | bin | 0 -> 1566 bytes | |||
-rw-r--r-- | test/clip-stroke.xlib.ref.png | bin | 0 -> 1563 bytes |
6 files changed, 125 insertions, 0 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index eab26f0c..29c89a0f 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -217,6 +217,9 @@ REFERENCE_IMAGES = \ clip-push-group.quartz.ref.png \ clip-push-group.ref.png \ clip-push-group.xlib.ref.png \ + clip-stroke.ref.png \ + clip-stroke.xlib.ref.png \ + clip-stroke.xlib-fallback.ref.png \ clip-text.ref.png \ clip-text.ps.xfail.png \ clip-text.svg.ref.png \ diff --git a/test/Makefile.sources b/test/Makefile.sources index e99ab0e9..7b513968 100644 --- a/test/Makefile.sources +++ b/test/Makefile.sources @@ -21,6 +21,7 @@ test_sources = \ clip-nesting.c \ clip-operator.c \ clip-push-group.c \ + clip-stroke.c \ clip-text.c \ clip-twice.c \ clip-unbounded.c \ diff --git a/test/clip-stroke.c b/test/clip-stroke.c new file mode 100644 index 00000000..9714dd06 --- /dev/null +++ b/test/clip-stroke.c @@ -0,0 +1,121 @@ +/* + * Copyright 2009 Chris Wilson + * + * 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 + * Chris Wilson not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior + * permission. Chris Wilson makes no representations about the + * suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL CHRIS WILSON 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@chris-wilson.co.uk> + */ + +#include "cairo-test.h" + +#define WIDTH 40 +#define HEIGHT 40 + +static void +shapes (cairo_t *cr) +{ + cairo_set_source_rgb (cr, 1, 0, 0); + cairo_paint (cr); + + cairo_set_source_rgb (cr, 0, 0.7, 0); + cairo_arc (cr, 10, 10, 7.5, 0, 2 * M_PI); + cairo_stroke (cr); + + cairo_set_source_rgb (cr, 0, 0.7, 0.7); + cairo_arc (cr, 10, 10, 25, 0, 2 * M_PI); + cairo_stroke (cr); + cairo_rectangle (cr, -5, -5, 30, 30); + cairo_stroke (cr); + + cairo_set_source_rgb (cr, 0.7, 0.7, 0); + cairo_save (cr); + cairo_translate (cr, 10, 10); + cairo_rotate (cr, M_PI/4); + cairo_translate (cr, -10, -10); + cairo_rectangle (cr, -5, -5, 30, 30); + cairo_stroke (cr); + cairo_restore (cr); + + cairo_set_source_rgb (cr, 0.7, 0.0, 0.7); + cairo_move_to (cr, 15, -10); + cairo_line_to (cr, 30, 10); + cairo_line_to (cr, 15, 30); + cairo_stroke (cr); +} + +static cairo_test_status_t +draw (cairo_t *cr, int width, int height) +{ + cairo_set_source_rgb (cr, 1, 1, 1); + cairo_paint (cr); + + cairo_translate (cr, 10, 10); + + /* simple clip */ + cairo_save (cr); + cairo_rectangle (cr, 0, 0, 20, 20); + cairo_clip (cr); + shapes (cr); + cairo_restore (cr); + + cairo_translate (cr, WIDTH, 0); + + /* unaligned clip */ + cairo_save (cr); + cairo_rectangle (cr, 0.5, 0.5, 20, 20); + cairo_clip (cr); + shapes (cr); + cairo_restore (cr); + + cairo_translate (cr, -WIDTH, HEIGHT); + + /* aligned-clip */ + cairo_save (cr); + cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD); + cairo_rectangle (cr, 0, 0, 20, 20); + cairo_rectangle (cr, 3, 3, 10, 10); + cairo_rectangle (cr, 7, 7, 10, 10); + cairo_clip (cr); + shapes (cr); + cairo_restore (cr); + + cairo_translate (cr, WIDTH, 0); + + /* force a clip-mask */ + cairo_save (cr); + cairo_arc (cr, 10, 10, 10, 0, 2 * M_PI); + cairo_new_sub_path (cr); + cairo_arc_negative (cr, 10, 10, 5, 2 * M_PI, 0); + cairo_new_sub_path (cr); + cairo_arc (cr, 10, 10, 2, 0, 2 * M_PI); + cairo_clip (cr); + shapes (cr); + cairo_restore (cr); + + return CAIRO_TEST_SUCCESS; +} + +CAIRO_TEST (clip_stroke, + "Tests stroke through complex clips.", + "clip, stroke", /* keywords */ + NULL, /* requirements */ + 2 * WIDTH, 2* HEIGHT, + NULL, draw) + diff --git a/test/clip-stroke.ref.png b/test/clip-stroke.ref.png Binary files differnew file mode 100644 index 00000000..5bd877df --- /dev/null +++ b/test/clip-stroke.ref.png diff --git a/test/clip-stroke.xlib-fallback.ref.png b/test/clip-stroke.xlib-fallback.ref.png Binary files differnew file mode 100644 index 00000000..ac9ad795 --- /dev/null +++ b/test/clip-stroke.xlib-fallback.ref.png diff --git a/test/clip-stroke.xlib.ref.png b/test/clip-stroke.xlib.ref.png Binary files differnew file mode 100644 index 00000000..76361833 --- /dev/null +++ b/test/clip-stroke.xlib.ref.png |