[cairo-commit] 2 commits - configure.in src/cairo-quartz-surface.c test/Makefile.am test/stroke-image.c test/stroke-image-quartz-ref.png test/stroke-image-ref.png
Vladimir Vukicevic
vladimir at kemper.freedesktop.org
Tue Mar 25 11:22:49 PDT 2008
configure.in | 3 +
src/cairo-quartz-surface.c | 9 ++++
test/Makefile.am | 3 +
test/stroke-image-quartz-ref.png |binary
test/stroke-image-ref.png |binary
test/stroke-image.c | 77 +++++++++++++++++++++++++++++++++++++++
6 files changed, 90 insertions(+), 2 deletions(-)
New commits:
commit 49a140b04bda85c03f824dcf565f1fcdd70b8965
Author: Vladimir Vukicevic <vladimir at pobox.com>
Date: Tue Mar 25 11:22:43 2008 -0700
[osx] additional fix to configure for multi-arch OSX builds
diff --git a/configure.in b/configure.in
index 6a86a33..e314115 100644
--- a/configure.in
+++ b/configure.in
@@ -67,7 +67,7 @@ AC_STDC_HEADERS
AC_C_INLINE
case $host_os in
- darwin*) XORG="no" ;;
+ darwin*)
AH_VERBATIM([X_BYTE_ORDER],[
/* Deal with multiple architecture compiles on Mac OS X */
#ifdef __APPLE_CC__
@@ -80,6 +80,7 @@ AH_VERBATIM([X_BYTE_ORDER],[
#endif
#endif
])
+ ;;
*)
AC_C_BIGENDIAN
AX_C_FLOAT_WORDS_BIGENDIAN
commit ae143d779ba5765f55754cb89af87b065d84ef04
Author: Vladimir Vukicevic <vladimir at pobox.com>
Date: Tue Mar 25 11:17:57 2008 -0700
[quartz] When stroking with an image source, use the right CTM for the image
Since the CTM was modified for the stroke transform, we need to reset
it before calling ConcatCTM for the source transform.
diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c
index 93ad82c..4c2e9b5 100644
--- a/src/cairo-quartz-surface.c
+++ b/src/cairo-quartz-surface.c
@@ -1728,7 +1728,7 @@ _cairo_quartz_surface_stroke (void *abstract_surface,
cairo_int_status_t rv = CAIRO_STATUS_SUCCESS;
cairo_quartz_action_t action;
quartz_stroke_t stroke;
- CGAffineTransform strokeTransform;
+ CGAffineTransform origCTM, strokeTransform;
CGPathRef path_for_unbounded = NULL;
ND((stderr, "%p _cairo_quartz_surface_stroke op %d source->type %d\n", surface, op, source->type));
@@ -1749,6 +1749,9 @@ _cairo_quartz_surface_stroke (void *abstract_surface,
CGContextSetLineCap (surface->cgContext, _cairo_quartz_cairo_line_cap_to_quartz (style->line_cap));
CGContextSetLineJoin (surface->cgContext, _cairo_quartz_cairo_line_join_to_quartz (style->line_join));
CGContextSetMiterLimit (surface->cgContext, style->miter_limit);
+
+ origCTM = CGContextGetCTM (surface->cgContext);
+
_cairo_quartz_cairo_matrix_to_quartz (ctm, &strokeTransform);
CGContextConcatCTM (surface->cgContext, strokeTransform);
@@ -1795,6 +1798,8 @@ _cairo_quartz_surface_stroke (void *abstract_surface,
CGContextReplacePathWithStrokedPath (surface->cgContext);
CGContextClip (surface->cgContext);
+ CGContextSetCTM (surface->cgContext, origCTM);
+
CGContextConcatCTM (surface->cgContext, surface->sourceTransform);
CGContextTranslateCTM (surface->cgContext, 0, surface->sourceImageRect.size.height);
CGContextScaleCTM (surface->cgContext, 1, -1);
@@ -1807,6 +1812,8 @@ _cairo_quartz_surface_stroke (void *abstract_surface,
CGContextReplacePathWithStrokedPath (surface->cgContext);
CGContextClip (surface->cgContext);
+ CGContextSetCTM (surface->cgContext, origCTM);
+
CGContextConcatCTM (surface->cgContext, surface->sourceTransform);
CGContextDrawShading (surface->cgContext, surface->sourceShading);
} else if (action != DO_NOTHING) {
diff --git a/test/Makefile.am b/test/Makefile.am
index 069ce1e..86b6de5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -111,6 +111,7 @@ rotate-image-surface-paint$(EXEEXT) \
scale-down-source-surface-paint$(EXEEXT) \
scale-source-surface-paint$(EXEEXT) \
stroke-ctm-caps$(EXEEXT) \
+stroke-image$(EXEEXT) \
select-font-face$(EXEEXT) \
select-font-no-show-text$(EXEEXT) \
self-copy$(EXEEXT) \
@@ -567,6 +568,8 @@ REFERENCE_IMAGES = \
show-text-current-point-quartz-ref.png \
skew-extreme-ref.png \
skew-extreme-ps-ref.png \
+ stroke-image-ref.png \
+ stroke-image-quartz-ref.png \
source-clip-ref.png \
source-clip-scale-quartz-ref.png \
source-clip-scale-ps-argb32-ref.png \
diff --git a/test/stroke-image-quartz-ref.png b/test/stroke-image-quartz-ref.png
new file mode 100644
index 0000000..db1f5a7
Binary files /dev/null and b/test/stroke-image-quartz-ref.png differ
diff --git a/test/stroke-image-ref.png b/test/stroke-image-ref.png
new file mode 100644
index 0000000..c8b9417
Binary files /dev/null and b/test/stroke-image-ref.png differ
diff --git a/test/stroke-image.c b/test/stroke-image.c
new file mode 100644
index 0000000..464d7af
--- /dev/null
+++ b/test/stroke-image.c
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2006 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: Vladimir Vukicevic <vladimir at pobox.com>
+ */
+
+#include "cairo-test.h"
+
+static cairo_test_draw_function_t draw;
+
+#define PAD 10
+#define SIZE 100
+#define IMAGE_SIZE (SIZE-PAD*2)
+#define LINE_WIDTH 10
+
+cairo_test_t test = {
+ "stroke-image",
+ "Test stroking with an image source, with a non-identity CTM",
+ SIZE, SIZE,
+ draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ cairo_surface_t *isurf = cairo_image_surface_create (CAIRO_FORMAT_RGB24, IMAGE_SIZE, IMAGE_SIZE);
+ cairo_t *cr_image = cairo_create (isurf);
+
+ /* Create the image */
+ cairo_set_source_rgb (cr_image, 0, 0, 0);
+ cairo_paint (cr_image);
+ cairo_set_source_rgb (cr_image, 0, 1, 0);
+ cairo_set_line_width (cr_image, LINE_WIDTH);
+ cairo_arc (cr_image, IMAGE_SIZE/2, IMAGE_SIZE/2, IMAGE_SIZE/2 - LINE_WIDTH/2, 0, M_PI * 2.0);
+ cairo_stroke (cr_image);
+ cairo_destroy (cr_image);
+
+ /* Now stroke with it */
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ cairo_paint (cr);
+
+ cairo_translate (cr, PAD, PAD);
+
+ cairo_set_source_surface (cr, isurf, 0, 0);
+
+ cairo_new_path (cr);
+ cairo_set_line_width (cr, LINE_WIDTH);
+ cairo_arc (cr, IMAGE_SIZE/2, IMAGE_SIZE/2, IMAGE_SIZE/2 - LINE_WIDTH/2, 0, M_PI * 2.0);
+ cairo_stroke (cr);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
More information about the cairo-commit
mailing list