[cairo-commit] 2 commits - src/cairo-polygon.c src/cairo-types-private.h test/clip-disjoint.c test/clip-disjoint.ref.png test/clip-disjoint.xlib.ref.png test/Makefile.am test/Makefile.sources
Chris Wilson
ickle at kemper.freedesktop.org
Wed Sep 2 17:02:44 PDT 2009
src/cairo-polygon.c | 29 ++++++++++--
src/cairo-types-private.h | 1
test/Makefile.am | 2
test/Makefile.sources | 1
test/clip-disjoint.c | 90 ++++++++++++++++++++++++++++++++++++++++
test/clip-disjoint.ref.png |binary
test/clip-disjoint.xlib.ref.png |binary
7 files changed, 118 insertions(+), 5 deletions(-)
New commits:
commit f1d284f9976d38f636c6791f11479ae75d7bd199
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Sep 3 01:00:59 2009 +0100
[polygon] Fix discard with non-banded disjoint clip boxes
The early discard checked if the line was below the last clip-box, or if
above the first. However, the clip-boxes are only sorted on by the bottom
(not the strict XY-banded sort of the regions) and so this was erroneously
discarding lines.
diff --git a/src/cairo-polygon.c b/src/cairo-polygon.c
index f3e8e4d..904b33d 100644
--- a/src/cairo-polygon.c
+++ b/src/cairo-polygon.c
@@ -63,8 +63,27 @@ _cairo_polygon_limit (cairo_polygon_t *polygon,
const cairo_box_t *limits,
int num_limits)
{
+ int n;
+
polygon->limits = limits;
polygon->num_limits = num_limits;
+
+ polygon->limit.p1.x = polygon->limit.p1.y = INT32_MAX;
+ polygon->limit.p2.x = polygon->limit.p2.y = INT32_MIN;
+
+ for (n = 0; n < num_limits; n++) {
+ if (limits[n].p1.x < polygon->limit.p1.x)
+ polygon->limit.p1.x = limits[n].p1.x;
+
+ if (limits[n].p1.y < polygon->limit.p1.y)
+ polygon->limit.p1.y = limits[n].p1.y;
+
+ if (limits[n].p2.x > polygon->limit.p2.x)
+ polygon->limit.p2.x = limits[n].p2.x;
+
+ if (limits[n].p2.y > polygon->limit.p2.y)
+ polygon->limit.p2.y = limits[n].p2.y;
+ }
}
void
@@ -233,7 +252,7 @@ _add_clipped_edge (cairo_polygon_t *polygon,
limits->p2.x);
if (left_y == right_y) /* horizontal within bounds */
- return;
+ continue;
p1_y = top;
p2_y = bottom;
@@ -342,10 +361,10 @@ _cairo_polygon_add_edge (cairo_polygon_t *polygon,
}
if (polygon->num_limits) {
- if (p2->y <= polygon->limits[0].p1.y)
+ if (p2->y <= polygon->limit.p1.y)
return;
- if (p1->y >= polygon->limits[polygon->num_limits-1].p2.y)
+ if (p1->y >= polygon->limit.p2.y)
return;
_add_clipped_edge (polygon, p1, p2, p1->y, p2->y, dir);
@@ -376,10 +395,10 @@ _cairo_polygon_add_line (cairo_polygon_t *polygon,
return CAIRO_STATUS_SUCCESS;
if (polygon->num_limits) {
- if (line->p2.y <= polygon->limits[0].p1.y)
+ if (line->p2.y <= polygon->limit.p1.y)
return CAIRO_STATUS_SUCCESS;
- if (line->p1.y >= polygon->limits[polygon->num_limits-1].p2.y)
+ if (line->p1.y >= polygon->limit.p2.y)
return CAIRO_STATUS_SUCCESS;
_add_clipped_edge (polygon, &line->p1, &line->p2, top, bottom, dir);
diff --git a/src/cairo-types-private.h b/src/cairo-types-private.h
index 54bd2a7..82754cf 100644
--- a/src/cairo-types-private.h
+++ b/src/cairo-types-private.h
@@ -254,6 +254,7 @@ typedef struct _cairo_polygon {
cairo_bool_t has_current_edge;
cairo_box_t extents;
+ cairo_box_t limit;
const cairo_box_t *limits;
int num_limits;
commit a6dfdeec82ec34d88276fd0bb0ddcc94405d89f3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Sep 3 00:59:21 2009 +0100
[test] Add clip-disjoint
Soeren found another bug (thanks Soeren!) in the clipping code - as
reproduced by this test case.
diff --git a/test/Makefile.am b/test/Makefile.am
index aaa520d..6b084e6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -161,6 +161,8 @@ REFERENCE_IMAGES = \
clear.svg12.argb32.xfail.png \
clear.svg12.rgb24.xfail.png \
clip-all.ref.png \
+ clip-disjoint.ref.png \
+ clip-disjoint.xlib.ref.png \
clip-empty.ref.png \
clip-fill.ref.png \
clip-fill.ps.xfail.png \
diff --git a/test/Makefile.sources b/test/Makefile.sources
index 3dbdd55..aec133f 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -14,6 +14,7 @@ test_sources = \
caps-sub-paths.c \
clear.c \
clip-all.c \
+ clip-disjoint.c \
clip-empty.c \
clip-fill.c \
clip-fill-rule.c \
diff --git a/test/clip-disjoint.c b/test/clip-disjoint.c
new file mode 100644
index 0000000..797898e
--- /dev/null
+++ b/test/clip-disjoint.c
@@ -0,0 +1,90 @@
+/*
+ * Copyright © 2008 Red Hat, Inc.
+ *
+ * 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
+ * Red Hat, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Red Hat, Inc. makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL RED HAT, INC. 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: Soren Sandmann <sandmann at redhat.com>
+ */
+
+#include "cairo-test.h"
+
+#define WIDTH 300
+#define HEIGHT 300
+
+typedef struct {
+ double x, y;
+} point_t;
+
+static void
+paint_curve (cairo_t *cr)
+{
+ const point_t points[] = {
+ { 100, 320 }, { 110, -80 },
+ { 180, 60 }, { 300, 170 },
+ { 300, -40 }
+ };
+ unsigned i;
+
+ cairo_set_line_width (cr, 2);
+ cairo_move_to (cr, points[0].x, points[0].y);
+
+ for (i = 1; i < sizeof (points) / sizeof (points[0]) - 2; i += 3) {
+ cairo_curve_to (cr,
+ points[i].x, points[i].y,
+ points[i + 1].x, points[i + 1].y,
+ points[i + 2].x, points[i + 2].y);
+ }
+ cairo_set_line_width (cr, 5);
+ cairo_stroke (cr);
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ /* Fill window with light blue */
+ cairo_set_source_rgba (cr, 0.8, 0.8, 1.9, 1.0);
+ cairo_paint (cr);
+
+ /* Paint curve in green */
+ cairo_set_source_rgba (cr, 0.6, 0.8, 0.6, 1.0);
+ paint_curve (cr);
+
+ /* Make clip region */
+ cairo_rectangle (cr, 228, 131, 50, 13);
+ cairo_rectangle (cr, 20, 99, 200, 75);
+ cairo_clip_preserve (cr);
+
+ /* Fill clip region with red */
+ cairo_set_source_rgba (cr, 1.0, 0.5, 0.5, 0.8);
+ cairo_fill (cr);
+
+ /* Paint curve again, this time in blue */
+ cairo_set_source_rgba (cr, 0, 0, 1.0, 1.0);
+ paint_curve (cr);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (clip_disjoint,
+ "Tests stroking through two disjoint clips.",
+ "clip, stroke", /* keywords */
+ NULL, /* requirements */
+ WIDTH, HEIGHT,
+ NULL, draw)
diff --git a/test/clip-disjoint.ref.png b/test/clip-disjoint.ref.png
new file mode 100644
index 0000000..131e0e5
Binary files /dev/null and b/test/clip-disjoint.ref.png differ
diff --git a/test/clip-disjoint.xlib.ref.png b/test/clip-disjoint.xlib.ref.png
new file mode 100644
index 0000000..8a1104f
Binary files /dev/null and b/test/clip-disjoint.xlib.ref.png differ
More information about the cairo-commit
mailing list