[cairo-commit] 3 commits - src/cairo-quartz-surface.c test/.gitignore test/long-dashed-lines.c test/long-dashed-lines-ref.png test/Makefile.am test/reflected-stroke.c test/reflected-stroke-ref.png
Chris Wilson
ickle at kemper.freedesktop.org
Tue Feb 26 09:10:24 PST 2008
src/cairo-quartz-surface.c | 6 +-
test/.gitignore | 2
test/Makefile.am | 4 +
test/long-dashed-lines-ref.png |binary
test/long-dashed-lines.c | 75 ++++++++++++++++++++++++++++++
test/reflected-stroke-ref.png |binary
test/reflected-stroke.c | 100 +++++++++++++++++++++++++++++++++++++++++
7 files changed, 184 insertions(+), 3 deletions(-)
New commits:
commit 65a8a279430a08e6f28b1e0354e9f18fda1a0ad7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Feb 26 14:14:38 2008 +0000
[test] Add reflected-stroke to exercise stroking with a reflected ctm.
Parts of the stroker depend upon whether we have in effect a reflection
matrix (one whose determinant < 0). This test incopororates the same
drawing under the a couple of reflections to exercise stroking under
matrices with both positive and negative determinants.
diff --git a/test/.gitignore b/test/.gitignore
index ca44c94..2e235a4 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -140,6 +140,7 @@ pthread-show-text
rectangle-rounding-error
rectilinear-miter-limit
rectilinear-stroke
+reflected-stroke
rel-path
rotate-image-surface-paint
scale-down-source-surface-paint
diff --git a/test/Makefile.am b/test/Makefile.am
index c3e6bbf..96692af 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -101,6 +101,7 @@ random-intersections$(EXEEXT) \
rectangle-rounding-error$(EXEEXT) \
rectilinear-miter-limit$(EXEEXT) \
rectilinear-stroke$(EXEEXT) \
+reflected-stroke$(EXEEXT) \
rel-path$(EXEEXT) \
rgb24-ignore-alpha$(EXEEXT) \
rotate-image-surface-paint$(EXEEXT) \
@@ -472,6 +473,7 @@ REFERENCE_IMAGES = \
rectangle-rounding-error-ref.png \
rectilinear-miter-limit-ref.png \
rectilinear-stroke-ref.png \
+ reflected-stroke-ref.png \
rel-path-quartz-ref.png \
rel-path-quartz-rgb24-ref.png \
rel-path-ps-rgb24-ref.png \
diff --git a/test/reflected-stroke-ref.png b/test/reflected-stroke-ref.png
new file mode 100644
index 0000000..14ed834
Binary files /dev/null and b/test/reflected-stroke-ref.png differ
diff --git a/test/reflected-stroke.c b/test/reflected-stroke.c
new file mode 100644
index 0000000..aa32098
--- /dev/null
+++ b/test/reflected-stroke.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright © 2008 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 author not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. The author makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE AUTHOR. 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"
+
+static cairo_test_draw_function_t draw;
+
+cairo_test_t test = {
+ "reflected-stroke",
+ "Exercises the stroker with a reflected ctm",
+ 200, 200,
+ draw
+};
+
+static void
+draw_symbol (cairo_t *cr)
+{
+ double dash[] = {6, 3};
+
+ cairo_rectangle (cr, -25, -25, 50, 50);
+ cairo_stroke (cr);
+
+ cairo_move_to (cr, 0, -25);
+ cairo_curve_to (cr, 12.5, -12.5, 12.5, -12.5, 0, 0);
+ cairo_curve_to (cr, -12.5, 12.5, -12.5, 12.5, 0, 25);
+ cairo_curve_to (cr, 12.5, 12.5, 12.5, 12.5, 0, 0);
+ cairo_stroke (cr);
+
+ cairo_save (cr);
+ cairo_set_dash (cr, dash, sizeof (dash) / sizeof (dash[0]), 0.);
+ cairo_move_to (cr, 0, 0);
+ cairo_arc (cr, 0, 0, 12.5, 0, 3 * M_PI / 2);
+ cairo_close_path (cr);
+ cairo_stroke (cr);
+ cairo_restore (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);
+
+ cairo_set_source_rgb (cr, 0, 0, 0);
+
+ cairo_save (cr);
+ cairo_translate (cr, 50, 50);
+ cairo_scale (cr, 1, 1);
+ draw_symbol (cr);
+ cairo_restore (cr);
+
+ cairo_save (cr);
+ cairo_translate (cr, 150, 50);
+ cairo_scale (cr, -1, 1);
+ draw_symbol (cr);
+ cairo_restore (cr);
+
+ cairo_save (cr);
+ cairo_translate (cr, 150, 150);
+ cairo_scale (cr, -1, -1);
+ draw_symbol (cr);
+ cairo_restore (cr);
+
+ cairo_save (cr);
+ cairo_translate (cr, 50, 150);
+ cairo_scale (cr, 1, -1);
+ draw_symbol (cr);
+ cairo_restore (cr);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
+
commit 76f0613e5f1244557eab31945d7e7c757d987304
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Feb 26 09:50:51 2008 +0000
[test] Add long-dashed-lines to exercise _cairo_box_intersects_line_segment().
Draw a few rectangles whose vertices are outside the bounds of the
surface, but whose segments cross the surface. This exercises the new
dashed stroker optimisation which tries to determine whether the line
segment is visible.
diff --git a/test/.gitignore b/test/.gitignore
index 12b9973..ca44c94 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -90,6 +90,7 @@ line-width-scale
line-width-zero
linear-gradient
linear-gradient-reflect
+long-dashed-lines
long-lines
mask
mask-alpha
diff --git a/test/Makefile.am b/test/Makefile.am
index 3d4599e..c3e6bbf 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -71,6 +71,7 @@ line-width-scale$(EXEEXT) \
line-width-zero$(EXEEXT) \
linear-gradient$(EXEEXT) \
linear-gradient-reflect$(EXEEXT) \
+long-dashed-lines$(EXEEXT) \
long-lines$(EXEEXT) \
mask$(EXEEXT) \
mask-alpha$(EXEEXT) \
@@ -387,6 +388,7 @@ REFERENCE_IMAGES = \
line-width-ref.png \
line-width-scale-ps-ref.png \
line-width-scale-ref.png \
+ long-dashed-lines-ref.png \
long-lines-ref.png \
mask-alpha-ref.png \
mask-alpha-svg-argb32-ref.png \
diff --git a/test/long-dashed-lines-ref.png b/test/long-dashed-lines-ref.png
new file mode 100644
index 0000000..caf8b5e
Binary files /dev/null and b/test/long-dashed-lines-ref.png differ
diff --git a/test/long-dashed-lines.c b/test/long-dashed-lines.c
new file mode 100644
index 0000000..fce6d79
--- /dev/null
+++ b/test/long-dashed-lines.c
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2008 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 author not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. The author makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE AUTHOR. 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"
+
+static cairo_test_draw_function_t draw;
+
+cairo_test_t test = {
+ "long-dashed-lines",
+ "Exercises _cairo_box_intersects_line_segment()",
+ 60, 60,
+ draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ int i;
+ double dashes[] = {6, 3};
+
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_paint (cr);
+
+ /* partially visible rectangle... */
+ cairo_rectangle (cr, -0.5, -0.5, 61, 61);
+
+ /* rectangles with intersecting segments... */
+ cairo_save (cr);
+ cairo_translate (cr, 30, 30);
+ for (i = 0; i < 4; i++) {
+ cairo_rotate (cr, M_PI / 4);
+ cairo_rectangle (cr, -37, -15, 74, 30);
+ }
+ cairo_restore (cr);
+
+ /* completely invisible rectangle */
+ cairo_rectangle (cr, -5, -5, 70, 70);
+
+ cairo_set_dash (cr, dashes, sizeof (dashes) / sizeof (dashes[0]), 0.);
+ cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+ cairo_set_line_join (cr, CAIRO_LINE_JOIN_BEVEL);
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ cairo_stroke (cr);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
+
commit cdeffc69d9daa931c3c4ffcbb9e093180da45fe5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Feb 26 13:04:33 2008 +0000
[cairo-quartz-surface] Make check fixup.
A couple of minor corrections to satisfy make check.
diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c
index 83c2b81..bd59386 100644
--- a/src/cairo-quartz-surface.c
+++ b/src/cairo-quartz-surface.c
@@ -34,12 +34,12 @@
* Vladimir Vukicevic <vladimir at mozilla.com>
*/
-#include <dlfcn.h>
-
#include "cairoint.h"
#include "cairo-quartz-private.h"
+#include <dlfcn.h>
+
/* The 10.5 SDK includes a funky new definition of FloatToFixed which
* causes all sorts of breakage; so reset to old-style definition
*/
@@ -414,7 +414,7 @@ CreateGradientFunction (cairo_gradient_pattern_t *gpat)
&callbacks);
}
-/* Obtain a CGImageRef from a cairo_surface_t * */
+/* Obtain a CGImageRef from a #cairo_surface_t * */
static CGImageRef
_cairo_surface_to_cgimage (cairo_surface_t *target,
More information about the cairo-commit
mailing list