[cairo-commit] 2 commits - src/cairo-path-stroke-boxes.c test/line-width-large-overlap.c test/Makefile.sources test/reference
Chris Wilson
ickle at kemper.freedesktop.org
Wed Sep 28 16:27:53 PDT 2011
dev/null |binary
src/cairo-path-stroke-boxes.c | 5
test/Makefile.sources | 1
test/line-width-large-overlap.c | 149 ++++++++++
test/reference/clip-fill-nz-unbounded.traps.rgb24.ref.png |binary
test/reference/line-width-large-overlap-dashed.ref.png |binary
test/reference/line-width-large-overlap-dashed.xfail.png |binary
test/reference/line-width-large-overlap-flipped.ref.png |binary
test/reference/line-width-large-overlap-flopped.ref.png |binary
test/reference/line-width-large-overlap-offset.ref.png |binary
test/reference/line-width-large-overlap-rotated.base.ref.png |binary
test/reference/line-width-large-overlap-rotated.ref.png |binary
test/reference/line-width-large-overlap-rotated.traps.ref.png |binary
test/reference/line-width-large-overlap.ref.png |binary
test/reference/line-width-overlap-offset.traps.ref.png |binary
15 files changed, 154 insertions(+), 1 deletion(-)
New commits:
commit 2994b0c634158f681d3ac2894270d609ed5af424
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Sep 28 23:54:00 2011 +0100
stroke: Use the tessellator to resolve overlapping strokes
If the stroke is too large, the strokes around the box overlap and we
fail to generate the canonical form of the boxes. So if we detect that
the boxes overlap, feed them through the tessellator to reduce them to
canonical form.
Fixes line-width-overlap.
Based on a patch by Paulo Zanoni <paulo.r.zanoni at intel.com>
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/cairo-path-stroke-boxes.c b/src/cairo-path-stroke-boxes.c
index 794250b..12e4dd1 100644
--- a/src/cairo-path-stroke-boxes.c
+++ b/src/cairo-path-stroke-boxes.c
@@ -619,7 +619,10 @@ _cairo_path_fixed_stroke_rectilinear_to_boxes (const cairo_path_fixed_t *path,
}
if (! rectilinear_stroker.dash.dashed &&
- _cairo_path_fixed_is_stroke_box (path, &box))
+ _cairo_path_fixed_is_stroke_box (path, &box) &&
+ /* if the segments overlap we need to feed them into the tessellator */
+ box.p2.x - box.p1.x > 2* rectilinear_stroker.half_line_width &&
+ box.p2.y - box.p1.y > 2* rectilinear_stroker.half_line_width)
{
cairo_box_t b;
commit 30eac7b2c5a3a2a9c5de4886cdd38666ef19cddb
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Sep 29 00:22:34 2011 +0100
test: Add line-width-large-overlap
Exercise the case of stroking a box with a pen wider than the box
itself, a variation on line-width-overlap suggested by Paulo Zanoni.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/test/Makefile.sources b/test/Makefile.sources
index f9aa66c..5ef777a 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -169,6 +169,7 @@ test_sources = \
leaky-dashed-stroke.c \
leaky-polygon.c \
line-width.c \
+ line-width-large-overlap.c \
line-width-overlap.c \
line-width-scale.c \
line-width-tolerance.c \
diff --git a/test/line-width-large-overlap.c b/test/line-width-large-overlap.c
new file mode 100644
index 0000000..767734f
--- /dev/null
+++ b/test/line-width-large-overlap.c
@@ -0,0 +1,149 @@
+/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */
+/*
+ * Copyright 2011 Red Hat Inc.
+ *
+ * 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: Benjamin Otte <otte at redhat.com>
+ */
+
+/*
+ * Test case taken from the WebKit test suite, failure originally reported
+ * by Zan Dobersek <zandobersek at gmail.com>. WebKit test is
+ * LayoutTests/canvas/philip/tests/2d.path.rect.selfintersect.html
+ */
+
+#include "cairo-test.h"
+
+#include <math.h>
+
+#define LINE_WIDTH 120
+#define SIZE 100
+#define RECT_SIZE 10
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ /* fill with green so RGB and RGBA tests can share the ref image */
+ cairo_set_source_rgb (cr, 0, 1, 0);
+ cairo_paint (cr);
+
+ /* red to see eventual bugs immediately */
+ cairo_set_source_rgb (cr, 1, 0, 0);
+
+ /* big line width */
+ cairo_set_line_width (cr, LINE_WIDTH);
+
+ /* rectangle that is smaller than the line width in center of image */
+ cairo_rectangle (cr,
+ (SIZE - RECT_SIZE) / 2,
+ (SIZE - RECT_SIZE) / 2,
+ RECT_SIZE,
+ RECT_SIZE);
+
+ cairo_stroke (cr);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+/* and again slightly offset to trigger another path */
+static cairo_test_status_t
+draw_offset (cairo_t *cr, int width, int height)
+{
+ cairo_translate (cr, .5, .5);
+ return draw (cr, width, height);
+}
+
+static cairo_test_status_t
+draw_rotated (cairo_t *cr, int width, int height)
+{
+ cairo_translate (cr, SIZE/2, SIZE/2);
+ cairo_rotate (cr, M_PI/4);
+ cairo_translate (cr, -SIZE/2, -SIZE/2);
+
+ return draw (cr, width, height);
+}
+
+static cairo_test_status_t
+draw_flipped (cairo_t *cr, int width, int height)
+{
+ cairo_translate (cr, SIZE/2, SIZE/2);
+ cairo_scale (cr, -1, 1);
+ cairo_translate (cr, -SIZE/2, -SIZE/2);
+
+ return draw (cr, width, height);
+}
+
+static cairo_test_status_t
+draw_flopped (cairo_t *cr, int width, int height)
+{
+ cairo_translate (cr, SIZE/2, SIZE/2);
+ cairo_scale (cr, 1, -1);
+ cairo_translate (cr, -SIZE/2, -SIZE/2);
+
+ return draw (cr, width, height);
+}
+
+static cairo_test_status_t
+draw_dashed (cairo_t *cr, int width, int height)
+{
+ const double dashes[] = { 4 };
+ cairo_set_dash (cr, dashes, 1, 0);
+ cairo_set_line_cap (cr, CAIRO_LINE_CAP_BUTT);
+ return draw (cr, width, height);
+}
+
+CAIRO_TEST (line_width_large_overlap,
+ "Test overlapping lines due to large line width",
+ "stroke", /* keywords */
+ NULL, /* requirements */
+ SIZE, SIZE,
+ NULL, draw)
+CAIRO_TEST (line_width_large_overlap_offset,
+ "Test overlapping lines due to large line width",
+ "stroke", /* keywords */
+ NULL, /* requirements */
+ SIZE, SIZE,
+ NULL, draw_offset)
+CAIRO_TEST (line_width_large_overlap_rotated,
+ "Test overlapping lines due to large line width",
+ "stroke", /* keywords */
+ NULL, /* requirements */
+ SIZE, SIZE,
+ NULL, draw_rotated)
+CAIRO_TEST (line_width_large_overlap_flipped,
+ "Test overlapping lines due to large line width",
+ "stroke", /* keywords */
+ NULL, /* requirements */
+ SIZE, SIZE,
+ NULL, draw_flipped)
+CAIRO_TEST (line_width_large_overlap_flopped,
+ "Test overlapping lines due to large line width",
+ "stroke", /* keywords */
+ NULL, /* requirements */
+ SIZE, SIZE,
+ NULL, draw_flopped)
+CAIRO_TEST (line_width_large_overlap_dashed,
+ "Test overlapping lines due to large line width",
+ "stroke", /* keywords */
+ NULL, /* requirements */
+ SIZE, SIZE,
+ NULL, draw_dashed)
diff --git a/test/reference/clip-fill-nz-unbounded.traps.rgb24.ref.png b/test/reference/clip-fill-nz-unbounded.traps.rgb24.ref.png
new file mode 100644
index 0000000..1ad0b17
Binary files /dev/null and b/test/reference/clip-fill-nz-unbounded.traps.rgb24.ref.png differ
diff --git a/test/reference/line-width-large-overlap-dashed.ref.png b/test/reference/line-width-large-overlap-dashed.ref.png
new file mode 100644
index 0000000..e6cdcc2
Binary files /dev/null and b/test/reference/line-width-large-overlap-dashed.ref.png differ
diff --git a/test/reference/line-width-large-overlap-dashed.xfail.png b/test/reference/line-width-large-overlap-dashed.xfail.png
new file mode 100644
index 0000000..8cd4d31
Binary files /dev/null and b/test/reference/line-width-large-overlap-dashed.xfail.png differ
diff --git a/test/reference/line-width-large-overlap-flipped.ref.png b/test/reference/line-width-large-overlap-flipped.ref.png
new file mode 100644
index 0000000..3c3464b
Binary files /dev/null and b/test/reference/line-width-large-overlap-flipped.ref.png differ
diff --git a/test/reference/line-width-large-overlap-flopped.ref.png b/test/reference/line-width-large-overlap-flopped.ref.png
new file mode 100644
index 0000000..3c3464b
Binary files /dev/null and b/test/reference/line-width-large-overlap-flopped.ref.png differ
diff --git a/test/reference/line-width-large-overlap-offset.ref.png b/test/reference/line-width-large-overlap-offset.ref.png
new file mode 100644
index 0000000..3c3464b
Binary files /dev/null and b/test/reference/line-width-large-overlap-offset.ref.png differ
diff --git a/test/reference/line-width-large-overlap-rotated.base.ref.png b/test/reference/line-width-large-overlap-rotated.base.ref.png
new file mode 100644
index 0000000..87fe752
Binary files /dev/null and b/test/reference/line-width-large-overlap-rotated.base.ref.png differ
diff --git a/test/reference/line-width-large-overlap-rotated.ref.png b/test/reference/line-width-large-overlap-rotated.ref.png
new file mode 100644
index 0000000..8ffa0db
Binary files /dev/null and b/test/reference/line-width-large-overlap-rotated.ref.png differ
diff --git a/test/reference/line-width-large-overlap-rotated.traps.ref.png b/test/reference/line-width-large-overlap-rotated.traps.ref.png
new file mode 100644
index 0000000..87fe752
Binary files /dev/null and b/test/reference/line-width-large-overlap-rotated.traps.ref.png differ
diff --git a/test/reference/line-width-large-overlap.ref.png b/test/reference/line-width-large-overlap.ref.png
new file mode 100644
index 0000000..3c3464b
Binary files /dev/null and b/test/reference/line-width-large-overlap.ref.png differ
diff --git a/test/reference/line-width-overlap-offset.traps.argb32.ref.png b/test/reference/line-width-overlap-offset.traps.argb32.ref.png
deleted file mode 100644
index cf8495b..0000000
Binary files a/test/reference/line-width-overlap-offset.traps.argb32.ref.png and /dev/null differ
diff --git a/test/reference/line-width-overlap-offset.traps.ref.png b/test/reference/line-width-overlap-offset.traps.ref.png
new file mode 100644
index 0000000..13a138b
Binary files /dev/null and b/test/reference/line-width-overlap-offset.traps.ref.png differ
diff --git a/test/reference/line-width-overlap-offset.traps.rgb24.ref.png b/test/reference/line-width-overlap-offset.traps.rgb24.ref.png
deleted file mode 100644
index cf8495b..0000000
Binary files a/test/reference/line-width-overlap-offset.traps.rgb24.ref.png and /dev/null differ
More information about the cairo-commit
mailing list