[cairo-commit] 2 commits - src/cairo-image-surface.c src/cairoint.h test/clip-intersect.c test/clip-intersect.ref.png test/Makefile.refs test/Makefile.sources

Chris Wilson ickle at kemper.freedesktop.org
Sun Jul 24 05:22:35 PDT 2011


 src/cairo-image-surface.c   |   19 +++++---
 src/cairoint.h              |    8 +++
 test/Makefile.refs          |    1 
 test/Makefile.sources       |    1 
 test/clip-intersect.c       |   94 ++++++++++++++++++++++++++++++++++++++++++++
 test/clip-intersect.ref.png |binary
 6 files changed, 116 insertions(+), 7 deletions(-)

New commits:
commit 080f81bf5c360398a9376cf75ed245603483236b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jul 24 13:05:55 2011 +0100

    image: Fix clip-intersect
    
    Explicitly convert the clearing of the unbounded area.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
index e2e0e18..c14aac0 100644
--- a/src/cairo-image-surface.c
+++ b/src/cairo-image-surface.c
@@ -3671,17 +3671,22 @@ _clip_and_composite_polygon (cairo_image_surface_t *dst,
 {
     cairo_status_t status;
 
-    if (polygon->num_edges == 0) {
-	cairo_traps_t traps;
+    if (_cairo_polygon_is_empty (polygon)) {
+	cairo_boxes_t boxes;
 
 	if (extents->is_bounded)
 	    return CAIRO_STATUS_SUCCESS;
 
-	_cairo_traps_init (&traps);
-	status = _clip_and_composite_trapezoids (dst, op, src,
-						 &traps, antialias,
-						 extents);
-	_cairo_traps_fini (&traps);
+	status = _cairo_clip_to_boxes (extents->clip, &boxes);
+	if (likely (status == CAIRO_STATUS_SUCCESS)) {
+	    extents->is_bounded = _cairo_operator_bounded_by_either (op);
+	    extents->mask = extents->bounded = extents->unbounded;
+	    status = _clip_and_composite_boxes (dst,
+						CAIRO_OPERATOR_CLEAR,
+						&_cairo_pattern_clear.base,
+						&boxes, extents);
+	    _cairo_boxes_fini (&boxes);
+	}
 
 	return status;
     }
diff --git a/src/cairoint.h b/src/cairoint.h
index 5503a07..b3ee61e 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -2070,6 +2070,14 @@ cairo_private cairo_status_t
 _cairo_polygon_intersect (cairo_polygon_t *a, int winding_a,
 			  cairo_polygon_t *b, int winding_b);
 
+static inline cairo_bool_t
+_cairo_polygon_is_empty (const cairo_polygon_t *polygon)
+{
+    return
+	polygon->num_edges == 0 ||
+	polygon->extents.p2.x <= polygon->extents.p1.x;
+}
+
 #define _cairo_polygon_status(P) ((cairo_polygon_t *) (P))->status
 
 /* cairo-spline.c */
commit e4b3f84d4c3f23ad6e33bb53dcc3a88f480977c0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jul 24 13:05:24 2011 +0100

    test: Add clip-intersect
    
    Exercises a bug in the unbounded drawing of an empty polygon...
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/test/Makefile.refs b/test/Makefile.refs
index f0e131d..1c05dea 100644
--- a/test/Makefile.refs
+++ b/test/Makefile.refs
@@ -152,6 +152,7 @@ REFERENCE_IMAGES = \
 	clip-image.image16.ref.png \
 	clip-image.ps.ref.png \
 	clip-image.ref.png \
+	clip-intersect.ref.png \
 	clip-nesting.pdf.argb32.ref.png \
 	clip-nesting.ps.argb32.ref.png \
 	clip-nesting.ps.rgb24.ref.png \
diff --git a/test/Makefile.sources b/test/Makefile.sources
index 0e6173b..d1658bb 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -42,6 +42,7 @@ test_sources = \
 	clip-fill-rule-pixel-aligned.c			\
 	clip-group-shapes.c				\
 	clip-image.c					\
+	clip-intersect.c				\
 	clip-nesting.c					\
 	clip-operator.c					\
 	clip-push-group.c				\
diff --git a/test/clip-intersect.c b/test/clip-intersect.c
new file mode 100644
index 0000000..295fbc9
--- /dev/null
+++ b/test/clip-intersect.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2009 Chris Wilson
+ * Copyright 2011 Intel Corporation
+ *
+ * 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
+ * Chris Wilson not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Chris Wilson makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL CHRIS WILSON 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: Chris Wilson <chris at chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+#define WIDTH 20
+#define HEIGHT 20
+
+static void clip_mask (cairo_t *cr)
+{
+    cairo_move_to (cr, 10, 0);
+    cairo_line_to (cr, 0, 10);
+    cairo_line_to (cr, 10, 20);
+    cairo_line_to (cr, 20, 10);
+    cairo_clip (cr);
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+
+    clip_mask (cr);
+    cairo_set_source_rgb (cr, 0, 1, 0);
+    cairo_paint (cr);
+    cairo_reset_clip (cr);
+
+    cairo_set_source_rgb (cr, 1, 0, 0);
+
+    cairo_rectangle (cr, 0, 0, 4, 4);
+    cairo_clip (cr);
+    clip_mask (cr);
+    cairo_paint (cr);
+    cairo_reset_clip (cr);
+
+    cairo_rectangle (cr, 20, 0, -4, 4);
+    cairo_clip (cr);
+    clip_mask (cr);
+    cairo_paint (cr);
+    cairo_reset_clip (cr);
+
+    cairo_rectangle (cr, 20, 20, -4, -4);
+    cairo_clip (cr);
+    clip_mask (cr);
+    cairo_paint (cr);
+    cairo_reset_clip (cr);
+
+    cairo_rectangle (cr, 0, 20, 4, -4);
+    cairo_clip (cr);
+    clip_mask (cr);
+    cairo_paint (cr);
+    cairo_reset_clip (cr);
+
+    cairo_set_source_rgb (cr, 0, 0, 1);
+
+    cairo_rectangle (cr, 8, 8, 4, 4);
+    cairo_clip (cr);
+    clip_mask (cr);
+    cairo_paint (cr);
+    cairo_reset_clip (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (clip_intersect,
+	    "Tests intersection of a simple clip with a clip-mask",
+	    "clip, paint", /* keywords */
+	    NULL, /* requirements */
+	    WIDTH, HEIGHT,
+	    NULL, draw)
diff --git a/test/clip-intersect.ref.png b/test/clip-intersect.ref.png
new file mode 100644
index 0000000..f02f1cb
Binary files /dev/null and b/test/clip-intersect.ref.png differ


More information about the cairo-commit mailing list