[cairo-commit] 2 commits - src/cairo-path.c test/Makefile.sources test/path-append.c test/path-append.ps.ref.png test/path-append.ref.png test/path-append.test-fallback.ref.png test/path-append.xlib-fallback.ref.png test/path-append.xlib.ref.png
Chris Wilson
ickle at kemper.freedesktop.org
Sun Mar 1 02:12:11 PST 2009
src/cairo-path.c | 4 -
test/Makefile.sources | 1
test/path-append.c | 81 +++++++++++++++++++++++++++++++++
test/path-append.ps.ref.png |binary
test/path-append.ref.png |binary
test/path-append.test-fallback.ref.png |binary
test/path-append.xlib-fallback.ref.png |binary
test/path-append.xlib.ref.png |binary
8 files changed, 84 insertions(+), 2 deletions(-)
New commits:
commit 9304984f4e20beec7b4de6a4141e2fd489130006
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Mar 1 10:10:24 2009 +0000
[path] Fix regression introduced with 005436
The order of the multiplication of the CTM and device_transform was
reversed.
diff --git a/src/cairo-path.c b/src/cairo-path.c
index d62843e..0544505 100644
--- a/src/cairo-path.c
+++ b/src/cairo-path.c
@@ -452,8 +452,8 @@ _cairo_path_append_to_context (const cairo_path_t *path,
user_to_backend = cr->gstate->ctm;
cairo_matrix_multiply (&user_to_backend,
- &cr->gstate->target->device_transform,
- &user_to_backend);
+ &user_to_backend,
+ &cr->gstate->target->device_transform);
end = &path->data[path->num_data];
for (p = &path->data[0]; p < end; p += p->header.length) {
commit b30de64a8ca3de7632696f45bdb580217bd9f8a1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Mar 1 10:05:16 2009 +0000
[test] Add regression test for 005436
Jeff Muizelaar found a regression in commit 005436 and submitted this
little test to exercise it. The essence of the bug appears to be wrt to
the product of the CTM and device transform matrices.
diff --git a/test/Makefile.sources b/test/Makefile.sources
index 69c581b..eb118ac 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -126,6 +126,7 @@ test_sources = \
paint-repeat.c \
paint-source-alpha.c \
paint-with-alpha.c \
+ path-append.c \
path-precision.c \
pattern-get-type.c \
pattern-getters.c \
diff --git a/test/path-append.c b/test/path-append.c
new file mode 100644
index 0000000..bcd282d
--- /dev/null
+++ b/test/path-append.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2009 Jeff Muizelaar
+ * Copyright © 2009 Chris Wilson
+ *
+ * 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 the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make no representations
+ * about the suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS 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.
+ */
+
+#include <stdlib.h>
+#include "cairo-test.h"
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ cairo_matrix_t m;
+ int xoffset = 50;
+ int yoffset = 50;
+
+ cairo_surface_t *shadow;
+ cairo_t *shadow_cr;
+ cairo_path_t *path;
+
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_paint (cr);
+
+ cairo_translate (cr, 130, 130);
+ cairo_rotate (cr, .5);//2*M_PI*angle/360);
+ cairo_rectangle (cr, 0, 0, 50, 100);
+ cairo_get_matrix (cr, &m);
+
+ shadow = cairo_surface_create_similar (cairo_get_target (cr),
+ CAIRO_CONTENT_COLOR_ALPHA,
+ 600 - xoffset,
+ 600 - yoffset);
+ cairo_surface_set_device_offset (shadow, xoffset, yoffset);
+ shadow_cr = cairo_create (shadow);
+ cairo_surface_destroy (shadow);
+
+ cairo_set_source_rgb (shadow_cr, 0, 1, 0);
+ cairo_set_matrix (shadow_cr, &m);
+
+ path = cairo_copy_path (cr);
+ cairo_new_path (shadow_cr);
+ cairo_append_path (shadow_cr, path);
+ cairo_fill (shadow_cr);
+ cairo_path_destroy (path);
+
+ cairo_identity_matrix (cr);
+ cairo_translate (cr, 10, 50);
+ cairo_set_source_surface (cr, cairo_get_target (shadow_cr), 0, 0);
+ cairo_paint (cr);
+ cairo_set_matrix (cr, &m);
+ cairo_set_source_rgb (cr, 1, 0, 0);
+ cairo_fill (cr);
+
+ cairo_destroy (shadow_cr);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (path_append,
+ "Test appending path to a context, in particular to exercise a regression in 005436",
+ "path", /* keywords */
+ NULL, /* requirements */
+ 600, 600,
+ NULL, draw)
diff --git a/test/path-append.ps.ref.png b/test/path-append.ps.ref.png
new file mode 100644
index 0000000..fd8026f
Binary files /dev/null and b/test/path-append.ps.ref.png differ
diff --git a/test/path-append.ref.png b/test/path-append.ref.png
new file mode 100644
index 0000000..de9057c
Binary files /dev/null and b/test/path-append.ref.png differ
diff --git a/test/path-append.test-fallback.ref.png b/test/path-append.test-fallback.ref.png
new file mode 100644
index 0000000..fa72ac0
Binary files /dev/null and b/test/path-append.test-fallback.ref.png differ
diff --git a/test/path-append.xlib-fallback.ref.png b/test/path-append.xlib-fallback.ref.png
new file mode 100644
index 0000000..08a33a2
Binary files /dev/null and b/test/path-append.xlib-fallback.ref.png differ
diff --git a/test/path-append.xlib.ref.png b/test/path-append.xlib.ref.png
new file mode 100644
index 0000000..fa72ac0
Binary files /dev/null and b/test/path-append.xlib.ref.png differ
More information about the cairo-commit
mailing list