[cairo-commit] 2 commits - src/cairo-image-surface.c test/a1-bug.c test/a1-bug.image16.ref.png test/a1-bug.ref.png test/a1-bug.xlib.ref.png test/Makefile.am test/Makefile.sources
Chris Wilson
ickle at kemper.freedesktop.org
Thu Jun 17 07:49:14 PDT 2010
src/cairo-image-surface.c | 15 +++++++---
test/Makefile.am | 3 ++
test/Makefile.sources | 1
test/a1-bug.c | 61 ++++++++++++++++++++++++++++++++++++++++++++
test/a1-bug.image16.ref.png |binary
test/a1-bug.ref.png |binary
test/a1-bug.xlib.ref.png |binary
7 files changed, 76 insertions(+), 4 deletions(-)
New commits:
commit 7ab9ce1b9130dcd63b2b2b2516b77ef1ae531144
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Jun 17 15:47:04 2010 +0100
image: Make a local copy of the trap coordinates as the boxes alias.
As we transform the array of trapezoids into an array of boxes in-place,
we must take local copies of the coordinates before writing into the
boxes otherwise we may inadvertently modify the trapezoidal coordinates.
Fixes test/a1-bug.
diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
index c9f1f13..a23ef48 100644
--- a/src/cairo-image-surface.c
+++ b/src/cairo-image-surface.c
@@ -3066,6 +3066,7 @@ _boxes_for_traps (cairo_boxes_t *boxes,
if (antialias != CAIRO_ANTIALIAS_NONE) {
for (i = 0; i < traps->num_traps; i++) {
+ /* Note the traps and boxes alias so we need to take the local copies first. */
cairo_fixed_t x1 = traps->traps[i].left.p1.x;
cairo_fixed_t x2 = traps->traps[i].right.p1.x;
cairo_fixed_t y1 = traps->traps[i].top;
@@ -3086,11 +3087,17 @@ _boxes_for_traps (cairo_boxes_t *boxes,
boxes->is_pixel_aligned = TRUE;
for (i = 0; i < traps->num_traps; i++) {
+ /* Note the traps and boxes alias so we need to take the local copies first. */
+ cairo_fixed_t x1 = traps->traps[i].left.p1.x;
+ cairo_fixed_t x2 = traps->traps[i].right.p1.x;
+ cairo_fixed_t y1 = traps->traps[i].top;
+ cairo_fixed_t y2 = traps->traps[i].bottom;
+
/* round down here to match Pixman's behavior when using traps. */
- boxes->chunks.base[i].p1.x = _cairo_fixed_round_down (traps->traps[i].left.p1.x);
- boxes->chunks.base[i].p1.y = _cairo_fixed_round_down (traps->traps[i].top);
- boxes->chunks.base[i].p2.x = _cairo_fixed_round_down (traps->traps[i].right.p1.x);
- boxes->chunks.base[i].p2.y = _cairo_fixed_round_down (traps->traps[i].bottom);
+ boxes->chunks.base[i].p1.x = _cairo_fixed_round_down (x1);
+ boxes->chunks.base[i].p1.y = _cairo_fixed_round_down (y1);
+ boxes->chunks.base[i].p2.x = _cairo_fixed_round_down (x2);
+ boxes->chunks.base[i].p2.y = _cairo_fixed_round_down (y2);
}
}
}
commit f2645fa361003636d1da6ca38c3b61fef1b1ce4d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Jun 17 15:38:53 2010 +0100
test: Add a1-bug
Capture a bug report from "cairouser" where a1 rasterisation is now
broken.
diff --git a/test/Makefile.am b/test/Makefile.am
index a7f1845..7b4bf8a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -131,6 +131,9 @@ CLEANFILES += $(BUILT_SOURCES)
# All tests which have a reference image go here.
REFERENCE_IMAGES = \
+ a1-bug.ref.png \
+ a1-bug.image16.ref.png \
+ a1-bug.xlib.ref.png \
a1-image-sample.ref.png \
a1-image-sample.gl.xfail.png \
a1-image-sample.quartz.xfail.png \
diff --git a/test/Makefile.sources b/test/Makefile.sources
index 243b53a..c91f871 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -1,4 +1,5 @@
test_sources = \
+ a1-bug.c \
a1-image-sample.c \
a1-mask.c \
a1-mask-sample.c \
diff --git a/test/a1-bug.c b/test/a1-bug.c
new file mode 100644
index 0000000..bdbecea
--- /dev/null
+++ b/test/a1-bug.c
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+#include "cairo-test.h"
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ static const struct point {
+ double x;
+ double y;
+ } xy[] = {
+ { 627.016212, 221.749777 },
+ { 756.120787, 221.749777 },
+ { 756.120787, 557.602766 },
+ { 626.952721, 557.602766 },
+ { 626.548456, 493.315729 },
+ };
+ unsigned int i;
+
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ cairo_paint (cr);
+
+ for (i = 0; i < sizeof (xy) / sizeof (xy[0]); i++)
+ cairo_line_to (cr, xy[i].x, xy[i].y);
+
+ cairo_set_source_rgb (cr, 1, 0, 0);
+ cairo_fill_preserve (cr);
+
+ cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
+ cairo_set_source_rgb (cr, 0, 1, 0);
+ cairo_fill (cr);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (a1_bug,
+ "Check the fidelity of the rasterisation.",
+ "a1 raster", /* keywords */
+ "target=raster", /* requirements */
+ 1000, 800,
+ NULL, draw)
diff --git a/test/a1-bug.image16.ref.png b/test/a1-bug.image16.ref.png
new file mode 100644
index 0000000..48ce4b6
Binary files /dev/null and b/test/a1-bug.image16.ref.png differ
diff --git a/test/a1-bug.ref.png b/test/a1-bug.ref.png
new file mode 100644
index 0000000..dc6ff93
Binary files /dev/null and b/test/a1-bug.ref.png differ
diff --git a/test/a1-bug.xlib.ref.png b/test/a1-bug.xlib.ref.png
new file mode 100644
index 0000000..4b08e06
Binary files /dev/null and b/test/a1-bug.xlib.ref.png differ
More information about the cairo-commit
mailing list