[cairo-commit] 2 commits - src/cairo.c test/clipped-group.c test/clipped-group-ps-ref.png test/clipped-group-ref.png test/Makefile.am
Jeff Muizelaar
jrmuizel at kemper.freedesktop.org
Thu Aug 7 16:26:14 PDT 2008
src/cairo.c | 12 ++++-
test/Makefile.am | 3 +
test/clipped-group-ps-ref.png |binary
test/clipped-group-ref.png |binary
test/clipped-group.c | 96 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 110 insertions(+), 1 deletion(-)
New commits:
commit 16939e1a8623a3671bf5ce848841616a45f79df2
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date: Thu Aug 7 19:19:39 2008 -0400
Center the group pattern transform around the device_transformed origin
When popping a group, transform it by the ctm centered at the origin
specified by the device_transform so that it ends up in the right place
when we try to paint. This fixes the regressions caused by
1a9809baab5d8adf6ccf165e8f5d294b498c2fd5 as shown by the pdf backend.
diff --git a/src/cairo.c b/src/cairo.c
index 2dc1acc..46e587b 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -587,7 +587,17 @@ cairo_pop_group (cairo_t *cr)
}
_cairo_gstate_get_matrix (cr->gstate, &group_matrix);
- cairo_pattern_set_matrix (group_pattern, &group_matrix);
+ /* Transform by group_matrix centered around device_transform so that when
+ * we call _cairo_gstate_copy_transformed_pattern the result is a pattern
+ * with a matrix equivalent to the device_transform of group_surface. */
+ if (_cairo_surface_has_device_transform (group_surface)) {
+ cairo_pattern_set_matrix (group_pattern, &group_surface->device_transform);
+ _cairo_pattern_transform (group_pattern, &group_matrix);
+ _cairo_pattern_transform (group_pattern, &group_surface->device_transform_inverse);
+ } else {
+ cairo_pattern_set_matrix (group_pattern, &group_matrix);
+ }
+
done:
cairo_surface_destroy (group_surface);
commit e8ddbd1a1425586eac0d40675127d529b7029ea1
Author: Jeff Muizelaar <jrmuizel at jrmuizel-desktop.(none)>
Date: Thu Aug 7 19:06:31 2008 -0400
Add a test case showing the invariance of push/pop_group
This shows the regressions caused by
1a9809baab5d8adf6ccf165e8f5d294b498c2fd5
diff --git a/test/Makefile.am b/test/Makefile.am
index c258223..f9ab75d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -21,6 +21,7 @@ clip-operator$(EXEEXT) \
clip-push-group$(EXEEXT) \
clip-twice$(EXEEXT) \
clip-zero$(EXEEXT) \
+clipped-group$(EXEEXT) \
close-path$(EXEEXT) \
composite-integer-translate-source$(EXEEXT) \
composite-integer-translate-over$(EXEEXT) \
@@ -325,6 +326,8 @@ REFERENCE_IMAGES = \
clip-twice-quartz-rgb24-ref.png \
clip-twice-ref.png \
clip-twice-rgb24-ref.png \
+ clipped-group-ref.png \
+ clipped-group-ps-ref.png \
close-path-ref.png \
close-path-ps-ref.png \
composite-integer-translate-over-ref.png \
diff --git a/test/clipped-group-ps-ref.png b/test/clipped-group-ps-ref.png
new file mode 100644
index 0000000..6ce3670
Binary files /dev/null and b/test/clipped-group-ps-ref.png differ
diff --git a/test/clipped-group-ref.png b/test/clipped-group-ref.png
new file mode 100644
index 0000000..89a7b18
Binary files /dev/null and b/test/clipped-group-ref.png differ
diff --git a/test/clipped-group.c b/test/clipped-group.c
new file mode 100644
index 0000000..724e6cf
--- /dev/null
+++ b/test/clipped-group.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright © 2008 Mozilla 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
+ * Mozilla Corporation not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Mozilla Corporation makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * MOZILLA CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL MOZILLA CORPORATION 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: Jeff Muizelaar
+ */
+
+#include "cairo-test.h"
+
+#define WIDTH 60
+#define HEIGHT 70
+
+static cairo_test_draw_function_t draw;
+
+cairo_test_t test = {
+ "clipped-group",
+ "Test that a clipped group ends up in the right place",
+ WIDTH, HEIGHT,
+ draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ /* fill with black so we don't need an rgb test case */
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ cairo_paint (cr);
+
+ /* setting a scale will ensure that the device offset is transformed */
+ cairo_scale (cr, 2.1, 2.8);
+ cairo_set_source_rgb (cr, 1, .5,.4);
+
+ /* all rectangles should look the same */
+
+ /* plain rectangle */
+ cairo_rectangle (cr, 4, 4, 8, 8);
+ cairo_fill (cr);
+
+ cairo_translate (cr, 10, 0);
+
+ /* clipped rectangle */
+ cairo_save (cr);
+ cairo_rectangle (cr, 3, 3, 9, 9);
+ cairo_clip (cr);
+ cairo_rectangle (cr, 4, 4, 8, 8);
+ cairo_fill (cr);
+ cairo_restore (cr);
+
+ cairo_translate (cr, 0, 10);
+
+ /* clipped and grouped rectangle */
+ cairo_save (cr);
+ cairo_rectangle (cr, 3, 3, 9, 9);
+ cairo_clip (cr);
+ cairo_push_group (cr);
+ cairo_rectangle (cr, 4, 4, 8, 8);
+ cairo_fill (cr);
+ cairo_pop_group_to_source (cr);
+ cairo_paint (cr);
+ cairo_restore (cr);
+
+ cairo_translate (cr, -10, 0);
+
+ /* grouped rectangle */
+ cairo_push_group (cr);
+ cairo_rectangle (cr, 4, 4, 8, 8);
+ cairo_fill (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