From 6e78409417117ad4de1aec65bb4753ff32e1e7a6 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 11 Sep 2009 14:19:38 +0100 Subject: [test] Update big-line and remove XFAIL Now that we use polygon clipping, output geometry should no longer exceed the 2^16 limits imposed by pixman. For the image backend, we now use spans for stroking and for the xlib backend we have to double check the range on the output trapezoids. In short, cairo should pass this test. --- test/Makefile.am | 8 ++++---- test/big-line.c | 16 ++++++++-------- test/big-line.ps.argb32.ref.png | Bin 977 -> 0 bytes test/big-line.ps.rgb24.ref.png | Bin 709 -> 0 bytes test/big-line.quartz.ref.png | Bin 1075 -> 0 bytes test/big-line.quartz.rgb24.ref.png | Bin 941 -> 0 bytes test/big-line.ref.png | Bin 0 -> 977 bytes test/big-line.xlib-fallback.ref.png | Bin 0 -> 723 bytes test/big-line.xlib.ref.png | Bin 0 -> 933 bytes 9 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 test/big-line.ps.argb32.ref.png delete mode 100644 test/big-line.ps.rgb24.ref.png delete mode 100644 test/big-line.quartz.ref.png delete mode 100644 test/big-line.quartz.rgb24.ref.png create mode 100644 test/big-line.ref.png create mode 100644 test/big-line.xlib-fallback.ref.png create mode 100644 test/big-line.xlib.ref.png diff --git a/test/Makefile.am b/test/Makefile.am index 5e1972fd..2a01270b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -138,10 +138,10 @@ REFERENCE_IMAGES = \ alpha-similar.rgb24.ref.png \ alpha-similar.svg.argb32.xfail.png \ alpha-similar.svg.rgb24.xfail.png \ - big-line.ps.argb32.ref.png \ - big-line.ps.rgb24.ref.png \ - big-line.quartz.ref.png \ - big-line.quartz.rgb24.ref.png \ + big-line.ref.png \ + big-line.ps.ref.png \ + big-line.xlib.png \ + big-line.xlib-fallback.png \ bilevel-image.ref.png \ bitmap-font.ref.png \ bitmap-font.rgb24.ref.png \ diff --git a/test/big-line.c b/test/big-line.c index 105e7ee0..6260fba1 100644 --- a/test/big-line.c +++ b/test/big-line.c @@ -28,35 +28,35 @@ static cairo_test_status_t draw (cairo_t *cr, int width, int height) { - cairo_new_path (cr); + cairo_set_source_rgb (cr, 1, 1, 1); + cairo_paint (cr); cairo_set_source_rgb (cr, 1, 1, 0); cairo_move_to (cr, 50, 50); - cairo_line_to (cr, 50000, 50000); + cairo_rel_line_to (cr, 50000, 50000); cairo_stroke (cr); cairo_set_source_rgb (cr, 1, 0, 0); cairo_move_to (cr, 50, 50); - cairo_line_to (cr, -50000, 50000); + cairo_rel_line_to (cr, -50000, 50000); cairo_stroke (cr); cairo_set_source_rgb (cr, 0, 1, 0); cairo_move_to (cr, 50, 50); - cairo_line_to (cr, 50000, -50000); + cairo_rel_line_to (cr, 50000, -50000); cairo_stroke (cr); cairo_set_source_rgb (cr, 0, 0, 1); cairo_move_to (cr, 50, 50); - cairo_line_to (cr, -50000, -50000); + cairo_rel_line_to (cr, -50000, -50000); cairo_stroke (cr); return CAIRO_TEST_SUCCESS; } CAIRO_TEST (big_line, - "Test drawing of simple lines with positive and negative coordinates > 2^16\n" - "This currently fails because of 16-bit limitations in pixman.", - "line", /* keywords */ + "Test drawing of simple lines with positive and negative coordinates > 2^16", + "stroke, line", /* keywords */ NULL, /* requirements */ 100, 100, NULL, draw) diff --git a/test/big-line.ps.argb32.ref.png b/test/big-line.ps.argb32.ref.png deleted file mode 100644 index 60e73213..00000000 Binary files a/test/big-line.ps.argb32.ref.png and /dev/null differ diff --git a/test/big-line.ps.rgb24.ref.png b/test/big-line.ps.rgb24.ref.png deleted file mode 100644 index 8be5f9f5..00000000 Binary files a/test/big-line.ps.rgb24.ref.png and /dev/null differ diff --git a/test/big-line.quartz.ref.png b/test/big-line.quartz.ref.png deleted file mode 100644 index b8dfe8b9..00000000 Binary files a/test/big-line.quartz.ref.png and /dev/null differ diff --git a/test/big-line.quartz.rgb24.ref.png b/test/big-line.quartz.rgb24.ref.png deleted file mode 100644 index c4fc1587..00000000 Binary files a/test/big-line.quartz.rgb24.ref.png and /dev/null differ diff --git a/test/big-line.ref.png b/test/big-line.ref.png new file mode 100644 index 00000000..1bcde8f5 Binary files /dev/null and b/test/big-line.ref.png differ diff --git a/test/big-line.xlib-fallback.ref.png b/test/big-line.xlib-fallback.ref.png new file mode 100644 index 00000000..99cd1e27 Binary files /dev/null and b/test/big-line.xlib-fallback.ref.png differ diff --git a/test/big-line.xlib.ref.png b/test/big-line.xlib.ref.png new file mode 100644 index 00000000..66a38775 Binary files /dev/null and b/test/big-line.xlib.ref.png differ -- cgit v1.2.3