[cairo-commit] 2 commits - src/cairo-bentley-ottmann-rectangular.c test/bug-bo-collins.c test/Makefile.sources test/reference

[Chris Wilson]

 src/cairo-bentley-ottmann-rectangular.c |    5 +-
 test/Makefile.sources                   |    1 
 test/bug-bo-collins.c                   |   76 ++++++++++++++++++++++++++++++++
 test/reference/bug-bo-collins.ref.png   |binary
 4 files changed, 80 insertions(+), 2 deletions(-)

New commits:
commit c09be681123388d562822d677db631101a8faa07
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed May 23 11:38:07 2012 +0100

    bo-rectangular: Emit subsummed boxes for overlapping edges
    
    Fixes bug-bo-collins
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49446
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-bentley-ottmann-rectangular.c b/src/cairo-bentley-ottmann-rectangular.c
index b69d425..5541bdc 100644
--- a/src/cairo-bentley-ottmann-rectangular.c
+++ b/src/cairo-bentley-ottmann-rectangular.c
@@ -487,6 +487,8 @@ active_edges_to_traps (sweep_line_t *sweep)
 	    }
 
 	    if (winding == 0) {
+		if (left->right != NULL)
+		    edge_end_box (sweep, left, top);
 		pos = right;
 		continue;
 	    }
@@ -557,7 +559,7 @@ sweep_line_delete_edge (sweep_line_t *sweep, edge_t *edge)
 }
 
 static inline cairo_bool_t
-sweep_line_delete (sweep_line_t	*sweep, rectangle_t	*rectangle)
+sweep_line_delete (sweep_line_t	*sweep, rectangle_t *rectangle)
 {
     cairo_bool_t update;
 
@@ -651,7 +653,6 @@ _cairo_bentley_ottmann_tessellate_rectangular (rectangle_t	**rectangles,
 		active_edges_to_traps (&sweep_line);
 		update = FALSE;
 	    }
-
 	    sweep_line.current_y = rectangle->bottom;
 	}
 
commit 7b2f787d1999bcc351b2e2904322020732939f5f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed May 23 11:48:30 2012 +0100

    test: Exercise rectangular bo bug
    
    Reported-by: S. Christian Collins <s_chriscollins at hotmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49446
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/test/Makefile.sources b/test/Makefile.sources
index 4e1fb84..ddb41b5 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -25,6 +25,7 @@ test_sources = \
 	bilevel-image.c					\
 	bug-40410.c					\
 	bug-bo-rectangular.c				\
+	bug-bo-collins.c				\
 	bug-bo-ricotz.c					\
 	bug-source-cu.c					\
 	bug-extents.c					\
diff --git a/test/bug-bo-collins.c b/test/bug-bo-collins.c
new file mode 100644
index 0000000..cf6d688
--- /dev/null
+++ b/test/bug-bo-collins.c
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2012 Intel Corporation
+ *
+ * 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: Chris Wilson <chris at chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+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_source_rgb (cr, 0, 0, 0);
+
+    cairo_translate (cr, 0, 0);
+    cairo_save (cr);
+    cairo_rectangle (cr, 10, 10, 20, 20);
+    cairo_rectangle (cr, 20, 10, -10, 10);
+    cairo_clip (cr);
+    cairo_paint (cr);
+    cairo_restore (cr);
+
+    cairo_translate (cr, 40, 0);
+    cairo_save (cr);
+    cairo_rectangle (cr, 10, 10, 20, 20);
+    cairo_rectangle (cr, 30, 10, -10, 10);
+    cairo_clip (cr);
+    cairo_paint (cr);
+    cairo_restore (cr);
+
+    cairo_translate (cr, 0, 40);
+    cairo_save (cr);
+    cairo_rectangle (cr, 10, 10, 20, 20);
+    cairo_rectangle (cr, 30, 20, -10, 10);
+    cairo_clip (cr);
+    cairo_paint (cr);
+    cairo_restore (cr);
+
+    cairo_translate (cr, -40, 0);
+    cairo_save (cr);
+    cairo_rectangle (cr, 10, 10, 20, 20);
+    cairo_rectangle (cr, 20, 20, -10, 10);
+    cairo_clip (cr);
+    cairo_paint (cr);
+    cairo_restore (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (bug_bo_collins,
+	    "Exercises a bug discovered by S. Christian Collins",
+	    "clip, rectangular", /* keywords */
+	    NULL, /* requirements */
+	    80, 80,
+	    NULL, draw)
diff --git a/test/reference/bug-bo-collins.ref.png b/test/reference/bug-bo-collins.ref.png
new file mode 100644
index 0000000..72e5c1d
Binary files /dev/null and b/test/reference/bug-bo-collins.ref.png differ