[cairo-commit] 3 commits - src/cairo-clip.c test/clip-push-group.c
test/clip-push-group-ref.png test/Makefile.am
Carl Worth
cworth at kemper.freedesktop.org
Thu Oct 19 15:48:16 PDT 2006
src/cairo-clip.c | 10 ++---
test/Makefile.am | 2 +
test/clip-push-group-ref.png |binary
test/clip-push-group.c | 75 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 82 insertions(+), 5 deletions(-)
New commits:
diff-tree b1944e1672ee6faa034dba4d8cf730886c35e848 (from f894ebf98022ecf5844cd50840e916d6ddbea0bf)
Author: Carl Worth <cworth at cworth.org>
Date: Thu Oct 19 15:48:13 2006 -0700
Fix bug in _cairo_clip_init_deep_copy (fixes clip-push-group crash)
Thanks to Miklós Erdélyi <erdelyim at gmail.com> for reporting
the original problem and suggesting the fix.
diff --git a/src/cairo-clip.c b/src/cairo-clip.c
index 516e3b0..83dda7b 100644
--- a/src/cairo-clip.c
+++ b/src/cairo-clip.c
@@ -563,11 +563,11 @@ _cairo_clip_init_deep_copy (cairo_clip_t
}
if (other->surface) {
- _cairo_surface_clone_similar (target, clip->surface,
- clip->surface_rect.x,
- clip->surface_rect.y,
- clip->surface_rect.width,
- clip->surface_rect.height,
+ _cairo_surface_clone_similar (target, other->surface,
+ other->surface_rect.x,
+ other->surface_rect.y,
+ other->surface_rect.width,
+ other->surface_rect.height,
&clip->surface);
clip->surface_rect = other->surface_rect;
}
diff-tree f894ebf98022ecf5844cd50840e916d6ddbea0bf (from f880f5e57bc44c2c2e70a80f0df21ea89084cd8c)
Author: Carl Worth <cworth at cworth.org>
Date: Thu Oct 19 15:45:53 2006 -0700
clip-push-group: Adjust test slightly to ensure mask-based clip is not anchored at the origin
This should help us test if there's an offset problem in copying
the mask-based clip during cairo_push_group.
diff --git a/test/clip-push-group-ref.png b/test/clip-push-group-ref.png
index acaf4d8..327cc90 100644
Binary files a/test/clip-push-group-ref.png and b/test/clip-push-group-ref.png differ
diff --git a/test/clip-push-group.c b/test/clip-push-group.c
index f18d13c..8274e85 100644
--- a/test/clip-push-group.c
+++ b/test/clip-push-group.c
@@ -34,6 +34,7 @@
#include "cairo-test.h"
#define SIZE 10
+#define PAD 2
static cairo_test_draw_function_t draw;
@@ -54,7 +55,7 @@ draw (cairo_t *cr, int width, int height
cairo_arc (cr,
SIZE / 2, SIZE / 2,
- SIZE / 2,
+ SIZE / 2 - PAD,
0, 2 * M_PI);
cairo_clip (cr);
diff-tree f880f5e57bc44c2c2e70a80f0df21ea89084cd8c (from 8d2f0367527cb23f5902db0526b69b7d83b97f9c)
Author: Carl Worth <cworth at cworth.org>
Date: Thu Oct 19 15:43:02 2006 -0700
test: Add clip-push-group to demonstrate crash in cairo_push_group
The crash happens anytime mask-based clipping is in effect
at the time of cairo_push_group. The crash was first reported
here:
http://lists.freedesktop.org/archives/cairo/2006-August/007698.html
diff --git a/test/Makefile.am b/test/Makefile.am
index be6bd24..304eca7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -12,6 +12,7 @@ clip-fill-rule \
clip-fill-rule-pixel-aligned \
clip-nesting \
clip-operator \
+clip-push-group \
clip-twice \
close-path \
composite-integer-translate-source \
@@ -180,6 +181,7 @@ clip-nesting-rgb24-ref.png \
clip-nesting-ps-argb32-ref.png \
clip-operator-ref.png \
clip-operator-rgb24-ref.png \
+clip-push-group-ref \
clip-twice-ref.png \
clip-twice-rgb24-ref.png \
clip-twice-ps-argb32-ref.png \
diff --git a/test/clip-push-group-ref.png b/test/clip-push-group-ref.png
new file mode 100644
index 0000000..acaf4d8
Binary files /dev/null and b/test/clip-push-group-ref.png differ
diff --git a/test/clip-push-group.c b/test/clip-push-group.c
new file mode 100644
index 0000000..f18d13c
--- /dev/null
+++ b/test/clip-push-group.c
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2006 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: Carl D. Worth <cworth at cworth.org>
+ */
+
+/* A test for the crash described here:
+ *
+ * http://lists.freedesktop.org/archives/cairo/2006-August/007698.html
+ *
+ * The triggering condition for this bug should be setting a
+ * surface-based clip and then calling cairo_push_group.
+ */
+
+#include "cairo-test.h"
+
+#define SIZE 10
+
+static cairo_test_draw_function_t draw;
+
+cairo_test_t test = {
+ "clip-push-group",
+ "Test that push_group doesn't crash after setting a surface-based clip",
+ SIZE, SIZE,
+ draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ /* An overly complex way of drawing a blue circle onto a red
+ * background, to trigger the bug. */
+ cairo_set_source_rgb (cr, 1, 0, 0); /* red */
+ cairo_paint (cr);
+
+ cairo_arc (cr,
+ SIZE / 2, SIZE / 2,
+ SIZE / 2,
+ 0, 2 * M_PI);
+ cairo_clip (cr);
+
+ cairo_push_group (cr);
+ cairo_set_source_rgb (cr, 0, 0, 1); /* blue */
+ cairo_paint (cr);
+ cairo_pop_group_to_source (cr);
+ cairo_paint (cr);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
More information about the cairo-commit
mailing list