summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2009-09-11 14:19:38 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2009-09-11 14:19:38 +0100
commit6e78409417117ad4de1aec65bb4753ff32e1e7a6 (patch)
treea997a448e874c52ea99a21ccc5a6f0e0b2923ba1
parentb495e7eb2ee2521a400d4b42e04242023bdb1e44 (diff)
[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.
-rw-r--r--test/Makefile.am8
-rw-r--r--test/big-line.c16
-rw-r--r--test/big-line.ps.argb32.ref.pngbin977 -> 0 bytes
-rw-r--r--test/big-line.ps.rgb24.ref.pngbin709 -> 0 bytes
-rw-r--r--test/big-line.quartz.ref.pngbin1075 -> 0 bytes
-rw-r--r--test/big-line.quartz.rgb24.ref.pngbin941 -> 0 bytes
-rw-r--r--test/big-line.ref.pngbin0 -> 977 bytes
-rw-r--r--test/big-line.xlib-fallback.ref.pngbin0 -> 723 bytes
-rw-r--r--test/big-line.xlib.ref.pngbin0 -> 933 bytes
9 files changed, 12 insertions, 12 deletions
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
--- a/test/big-line.ps.argb32.ref.png
+++ /dev/null
Binary files 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
--- a/test/big-line.ps.rgb24.ref.png
+++ /dev/null
Binary files differ
diff --git a/test/big-line.quartz.ref.png b/test/big-line.quartz.ref.png
deleted file mode 100644
index b8dfe8b9..00000000
--- a/test/big-line.quartz.ref.png
+++ /dev/null
Binary files 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
--- a/test/big-line.quartz.rgb24.ref.png
+++ /dev/null
Binary files differ
diff --git a/test/big-line.ref.png b/test/big-line.ref.png
new file mode 100644
index 00000000..1bcde8f5
--- /dev/null
+++ b/test/big-line.ref.png
Binary files 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
--- /dev/null
+++ b/test/big-line.xlib-fallback.ref.png
Binary files differ
diff --git a/test/big-line.xlib.ref.png b/test/big-line.xlib.ref.png
new file mode 100644
index 00000000..66a38775
--- /dev/null
+++ b/test/big-line.xlib.ref.png
Binary files differ