[cairo-commit] 2 commits - src/cairo-bentley-ottmann-rectangular.c test/bug-bo-rectangular.c test/bug-bo-rectangular.ref.png test/Makefile.am test/Makefile.sources

Chris Wilson ickle at kemper.freedesktop.org
Tue Feb 23 01:31:53 PST 2010


 src/cairo-bentley-ottmann-rectangular.c |   31 ++++++--------
 test/Makefile.am                        |    1 
 test/Makefile.sources                   |    1 
 test/bug-bo-rectangular.c               |   67 ++++++++++++++++++++++++++++++++
 test/bug-bo-rectangular.ref.png         |binary
 5 files changed, 83 insertions(+), 17 deletions(-)

New commits:
commit 6ab5f89571b0252496d58242ed3060a9486d68d4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Feb 23 08:54:58 2010 +0000

    bo-rectangular: Fix incorrect skipping of colinear eo edges
    
    Fixes test/bug-bo-rectangular
    
    After skipping edges, we need to bd careful to only terminate the box on
    a closing edge.

diff --git a/src/cairo-bentley-ottmann-rectangular.c b/src/cairo-bentley-ottmann-rectangular.c
index 736762e..2cb01cb 100644
--- a/src/cairo-bentley-ottmann-rectangular.c
+++ b/src/cairo-bentley-ottmann-rectangular.c
@@ -422,9 +422,6 @@ active_edges_to_traps (sweep_line_t	*sweep,
 
 		winding += right->dir;
 		if (winding == 0) {
-		    if (right->next == &sweep->tail)
-			break;
-
 		    /* skip co-linear edges */
 		    if (likely (right->x != right->next->x))
 			break;
@@ -440,30 +437,31 @@ active_edges_to_traps (sweep_line_t	*sweep,
 	    pos = right->next;
 	} while (pos != &sweep->tail);
     } else {
-	edge_t *left, *right;
 	do {
-	    left = pos;
-	    pos = left->next;
-	    do {
-		right = pos;
-		pos = pos->next;
+	    edge_t *right = pos->next;
+	    int count = 0;
 
-		if (right->right != NULL) {
+	    do {
+		/* End all subsumed traps */
+		if (unlikely (right->right != NULL)) {
 		    edge_end_box (sweep,
 				  right, top, do_traps, container);
 		}
 
-		if (pos == &sweep->tail)
-		    break;
+		if (++count & 1) {
+		    /* skip co-linear edges */
+		    if (likely (right->x != right->next->x))
+			break;
+		}
 
-		/* skip co-linear edges */
-		if (right->x != pos->x)
-		    break;
+		right = right->next;
 	    } while (TRUE);
 
 	    edge_start_or_continue_box (sweep,
-					left, right, top,
+					pos, right, top,
 					do_traps, container);
+
+	    pos = right->next;
 	} while (pos != &sweep->tail);
     }
 
@@ -717,7 +715,6 @@ _cairo_bentley_ottmann_tessellate_rectangular_traps (cairo_traps_t *traps,
 
     dump_traps (traps, "bo-rects-traps-out.txt");
 
-
     return status;
 }
 
commit 1897156d96d77ff28f585794c1eb1baffa105488
Author: Benjamin Otte <otte at gnome.com>
Date:   Tue Feb 23 08:41:27 2010 +0000

    test: Add bug-bo-rectangular
    
    Exercises a bug found in the special case rectangular tessellator with
    colinear eo edges.

diff --git a/test/Makefile.am b/test/Makefile.am
index 12111aa..77e8237 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -144,6 +144,7 @@ REFERENCE_IMAGES = \
 	alpha-similar.svg.rgb24.xfail.png \
 	big-line.ref.png \
 	big-line.xlib.ref.png \
+	bug-bo-rectangular.ref.png \
 	bilevel-image.ref.png \
 	bitmap-font.ref.png \
 	bitmap-font.rgb24.ref.png \
diff --git a/test/Makefile.sources b/test/Makefile.sources
index 87c25a0..0f524e1 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -7,6 +7,7 @@ test_sources = \
 	big-line.c					\
 	big-trap.c					\
 	bilevel-image.c					\
+	bug-bo-rectangular.c				\
 	caps.c						\
 	caps-joins.c					\
 	caps-joins-alpha.c				\
diff --git a/test/bug-bo-rectangular.c b/test/bug-bo-rectangular.c
new file mode 100644
index 0000000..08e2e49
--- /dev/null
+++ b/test/bug-bo-rectangular.c
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2010 Red Hat
+ *
+ * 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
+ * Intel not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Intel makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL RED HAT 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: Benjamin Otte <otte at gnome.com>
+ */
+
+#include "cairo-test.h"
+
+static void
+rect (cairo_t *cr, int x1, int y1, int x2, int y2)
+{
+    cairo_rectangle (cr, x1, y1, x2 - x1, y2 - y1);
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+
+    cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+
+    cairo_scale (cr, 1./256, 1./256);
+
+    rect (cr, 0, 0, 29696, 7680);
+    rect (cr, 0, 0, -15360, 15360);
+    cairo_clip (cr);
+
+    cairo_set_source_rgb (cr, 1, 0.5, 0);
+    cairo_paint (cr);
+
+    rect (cr, 9984, 0, 2969, 3840);
+    rect (cr, 0, 3840, 9472, 7680);
+    cairo_clip (cr);
+
+    rect (cr, 0, 3840, 3584, 7680);
+    cairo_set_source_rgb (cr, 1, 0, 0.5);
+    cairo_fill (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (bug_bo_rectangular,
+	    "Tests a bug found by Benjamin Otte in the rectangular tessellator",
+	    "tessellator", /* keywords */
+	    NULL, /* requirements */
+	    300, 300,
+	    NULL, draw)
diff --git a/test/bug-bo-rectangular.ref.png b/test/bug-bo-rectangular.ref.png
new file mode 100644
index 0000000..ffa4ede
Binary files /dev/null and b/test/bug-bo-rectangular.ref.png differ


More information about the cairo-commit mailing list