[cairo-commit] 3 commits - configure.in src/cairo-pdf-surface.c test/.gitignore test/Makefile.am test/smask.c test/smask-fill.c test/smask-fill-ref.png test/smask-image-mask.c test/smask-image-mask-ref.png test/smask-mask.c test/smask-mask-ref.png test/smask-paint.c test/smask-paint-ref.png test/smask-ref.png test/smask-stroke.c test/smask-stroke-ref.png test/smask-text.c test/smask-text-ref.png
Chris Wilson
ickle at kemper.freedesktop.org
Fri Apr 4 06:57:52 PDT 2008
configure.in | 15 ++--
src/cairo-pdf-surface.c | 9 ++
test/.gitignore | 7 ++
test/Makefile.am | 14 ++++
test/smask-fill-ref.png |binary
test/smask-fill.c | 83 ++++++++++++++++++++++++++
test/smask-image-mask-ref.png |binary
test/smask-image-mask.c | 92 +++++++++++++++++++++++++++++
test/smask-mask-ref.png |binary
test/smask-mask.c | 107 ++++++++++++++++++++++++++++++++++
test/smask-paint-ref.png |binary
test/smask-paint.c | 90 +++++++++++++++++++++++++++++
test/smask-ref.png |binary
test/smask-stroke-ref.png |binary
test/smask-stroke.c | 83 ++++++++++++++++++++++++++
test/smask-text-ref.png |binary
test/smask-text.c | 92 +++++++++++++++++++++++++++++
test/smask.c | 130 ++++++++++++++++++++++++++++++++++++++++++
18 files changed, 714 insertions(+), 8 deletions(-)
New commits:
commit f72799a2520feb7ed04fd14e53db59fe697a58d1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Apr 4 14:15:58 2008 +0100
[configure.in] Add a link to the LTP homepage.
If ./configure --enable-gcov fails due to a missing LTP package, then
include a link to LTP homepage in the error message.
diff --git a/configure.in b/configure.in
index 89cdd3c..97bee95 100644
--- a/configure.in
+++ b/configure.in
@@ -902,23 +902,24 @@ if test "x$use_gcov" = "xyes"; then
fi
done
])
- else
- ltp_msg="To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list"
- AC_MSG_ERROR([$ltp_msg])
fi
case $cairo_cv_ltp_version in
""|invalid[)]
- ltp_msg="You must have one of the following versions of LTP: $ltp_version_list (found: $ltp_version)."
- AC_MSG_ERROR([$ltp_msg])
- LTP="exit 0;"
;;
*)
cairo_has_lcov=yes
+ ;;
esac
+ if test "x$cairo_has_lcov" != "xyes"; then
+ AC_MSG_ERROR([[To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list.
+Please install the Linux Test Project [http://ltp.sourceforge.net/], and try again.]])
+ fi
+
if test -z "$LTP_GENHTML"; then
- AC_MSG_ERROR([Could not find genhtml from the LTP package])
+ AC_MSG_ERROR([[Could not find genhtml from the LTP package.
+Please install the Linux Test Project [http://ltp.sourceforge.net/], and try again.]])
fi
AC_DEFINE(HAVE_GCOV, 1, [Whether you have gcov])
commit c0593d16c7f2ca9c1ba4d05b6cbf3cf9c2f0524b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Apr 4 12:53:13 2008 +0100
[pdf] Copy the glyphs for use within an smask group.
When constructing an smask group using PDF_SHOW_GLYPHS, we need a copy
of the glyphs else they'll be freed be we use them (in _show_page()).
diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
index ce6d8c4..862e941 100644
--- a/src/cairo-pdf-surface.c
+++ b/src/cairo-pdf-surface.c
@@ -731,6 +731,8 @@ _cairo_pdf_smask_group_destroy (cairo_pdf_smask_group_t *group)
cairo_pattern_destroy (group->source);
if (group->mask)
cairo_pattern_destroy (group->mask);
+ if (group->glyphs)
+ free (group->glyphs);
if (group->scaled_font)
cairo_scaled_font_destroy (group->scaled_font);
free (group);
@@ -4627,7 +4629,12 @@ _cairo_pdf_surface_show_glyphs (void *abstract_surface,
group->operation = PDF_SHOW_GLYPHS;
group->source = cairo_pattern_reference (source);
group->source_res = pattern_res;
- group->glyphs = glyphs;
+ group->glyphs = _cairo_malloc_ab (num_glyphs, sizeof (cairo_glyph_t));
+ if (group->glyphs == NULL) {
+ _cairo_pdf_smask_group_destroy (group);
+ return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+ }
+ memcpy (group->glyphs, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
group->num_glyphs = num_glyphs;
group->scaled_font = cairo_scaled_font_reference (scaled_font);
status = _cairo_pdf_surface_add_smask_group (surface, group);
commit a74db7e7bc092533d244123ea2ae272edf3f5d8f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Apr 4 12:34:40 2008 +0100
[test] Exercise "soft" masks.
PDF has a concept of "soft" masks, for which it is able to construct a
mask out of PDF drawing operations. These tests exercise constructing
various masks using the high level drawing operations.
diff --git a/test/.gitignore b/test/.gitignore
index 268afca..689ecf0 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -162,6 +162,13 @@ set-source
show-glyphs-many
show-text-current-point
skew-extreme
+smask
+smask-fill
+smask-image-mask
+smask-mask
+smask-paint
+smask-stroke
+smask-text
solid-pattern-cache-stress
source-clip
source-clip-scale
diff --git a/test/Makefile.am b/test/Makefile.am
index 2dce231..b73df23 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -120,6 +120,13 @@ self-intersecting$(EXEEXT) \
set-source$(EXEEXT) \
show-text-current-point$(EXEEXT) \
skew-extreme$(EXEEXT) \
+smask$(EXEEXT) \
+smask-fill$(EXEEXT) \
+smask-image-mask$(EXEEXT) \
+smask-mask$(EXEEXT) \
+smask-paint$(EXEEXT) \
+smask-stroke$(EXEEXT) \
+smask-text$(EXEEXT) \
solid-pattern-cache-stress$(EXEEXT) \
source-clip$(EXEEXT) \
source-clip-scale$(EXEEXT) \
@@ -579,6 +586,13 @@ REFERENCE_IMAGES = \
show-text-current-point-quartz-ref.png \
skew-extreme-ref.png \
skew-extreme-ps-ref.png \
+ smask-ref.png \
+ smask-fill-ref.png \
+ smask-image-mask-ref.png \
+ smask-mask-ref.png \
+ smask-paint-ref.png \
+ smask-stroke-ref.png \
+ smask-text-ref.png \
stroke-image-ref.png \
stroke-image-pdf-ref.png \
stroke-image-ps-ref.png \
diff --git a/test/smask-fill-ref.png b/test/smask-fill-ref.png
new file mode 100644
index 0000000..c778a79
Binary files /dev/null and b/test/smask-fill-ref.png differ
diff --git a/test/smask-fill.c b/test/smask-fill.c
new file mode 100644
index 0000000..980018e
--- /dev/null
+++ b/test/smask-fill.c
@@ -0,0 +1,83 @@
+/*
+ * 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
+ * Chris Wilson not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Chris Wilson makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL CHRIS WILSON 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 = {
+ "smask-fill",
+ "Test the support of \"soft\" masks with fills",
+ 60, 60,
+ draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ cairo_surface_t *mask;
+ cairo_pattern_t *pattern;
+ cairo_t *cr2;
+
+ mask = cairo_surface_create_similar (cairo_get_group_target (cr),
+ CAIRO_CONTENT_ALPHA,
+ width, height);
+ cr2 = cairo_create (mask);
+
+ cairo_save (cr2); {
+ cairo_set_operator (cr2, CAIRO_OPERATOR_CLEAR);
+ cairo_paint (cr2);
+ } cairo_restore (cr2);
+
+ pattern = cairo_pattern_create_linear (0, 0, width, height);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.00, 0., 0., 0., 0.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.25, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.50, 1., 1., 1., .5);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.75, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 1.00, 0., 0., 0., 0.);
+ cairo_set_source (cr2, pattern);
+ cairo_pattern_destroy (pattern);
+
+ cairo_arc (cr2, 0.5 * width, 0.5 * height, 0.45 * height, 0, 2 * M_PI);
+ cairo_fill (cr2);
+ cairo_destroy (cr2);
+
+
+ cairo_set_source_rgb (cr, 0, 0, 1.0);
+ cairo_paint (cr);
+
+ cairo_set_source_rgb (cr, 1.0, 0, 0);
+ cairo_mask_surface (cr, mask, 0, 0);
+ cairo_surface_destroy (mask);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
+
diff --git a/test/smask-image-mask-ref.png b/test/smask-image-mask-ref.png
new file mode 100644
index 0000000..858b209
Binary files /dev/null and b/test/smask-image-mask-ref.png differ
diff --git a/test/smask-image-mask.c b/test/smask-image-mask.c
new file mode 100644
index 0000000..5c805e1
--- /dev/null
+++ b/test/smask-image-mask.c
@@ -0,0 +1,92 @@
+/*
+ * 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
+ * Chris Wilson not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Chris Wilson makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL CHRIS WILSON 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 = {
+ "smask-image-mask",
+ "Test the support of \"soft\" masks with a secondary image mask",
+ 60, 60,
+ draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ static uint32_t data[] = {
+ 0xaa000000, 0x55000000,
+ 0x55000000, 0xaa000000,
+ };
+
+ cairo_surface_t *mask, *mask2;
+ cairo_pattern_t *pattern;
+ cairo_t *cr2;
+
+ mask = cairo_surface_create_similar (cairo_get_group_target (cr),
+ CAIRO_CONTENT_ALPHA,
+ width, height);
+ cr2 = cairo_create (mask);
+
+ cairo_save (cr2); {
+ cairo_set_operator (cr2, CAIRO_OPERATOR_CLEAR);
+ cairo_paint (cr2);
+ } cairo_restore (cr2);
+
+ pattern = cairo_pattern_create_linear (0, 0, width, height);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.00, 0., 0., 0., 0.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.25, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.50, 1., 1., 1., .5);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.75, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 1.00, 0., 0., 0., 0.);
+ cairo_set_source (cr2, pattern);
+ cairo_pattern_destroy (pattern);
+
+ mask2 = cairo_image_surface_create_for_data ((unsigned char *) data,
+ CAIRO_FORMAT_ARGB32, 2, 2, 8);
+ pattern = cairo_pattern_create_for_surface (mask2);
+ cairo_surface_destroy (mask2);
+ cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+ cairo_mask (cr2, pattern);
+ cairo_pattern_destroy (pattern);
+ cairo_destroy (cr2);
+
+ cairo_set_source_rgb (cr, 0, 0, 1.0);
+ cairo_paint (cr);
+
+ cairo_set_source_rgb (cr, 1.0, 0, 0);
+ cairo_mask_surface (cr, mask, 0, 0);
+ cairo_surface_destroy (mask);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
+
diff --git a/test/smask-mask-ref.png b/test/smask-mask-ref.png
new file mode 100644
index 0000000..eabd2d6
Binary files /dev/null and b/test/smask-mask-ref.png differ
diff --git a/test/smask-mask.c b/test/smask-mask.c
new file mode 100644
index 0000000..3d8cb05
--- /dev/null
+++ b/test/smask-mask.c
@@ -0,0 +1,107 @@
+/*
+ * 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
+ * Chris Wilson not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Chris Wilson makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL CHRIS WILSON 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 = {
+ "smask-mask",
+ "Test the support of \"soft\" masks with a secondary mask",
+ 60, 60,
+ draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ cairo_surface_t *mask, *mask2;
+ cairo_pattern_t *pattern;
+ cairo_t *cr2;
+
+ mask = cairo_surface_create_similar (cairo_get_group_target (cr),
+ CAIRO_CONTENT_ALPHA,
+ width, height);
+
+ mask2 = cairo_surface_create_similar (mask,
+ CAIRO_CONTENT_ALPHA,
+ width, height);
+ cr2 = cairo_create (mask2);
+
+ cairo_save (cr2); {
+ cairo_set_operator (cr2, CAIRO_OPERATOR_CLEAR);
+ cairo_paint (cr2);
+ } cairo_restore (cr2);
+
+ pattern = cairo_pattern_create_linear (0, 0, width, height);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.00, 0., 0., 0., 0.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.25, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.50, 1., 1., 1., .5);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.75, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 1.00, 0., 0., 0., 0.);
+ cairo_set_source (cr2, pattern);
+ cairo_pattern_destroy (pattern);
+ cairo_paint (cr2);
+ cairo_destroy (cr2);
+
+
+ cr2 = cairo_create (mask);
+
+ cairo_save (cr2); {
+ cairo_set_operator (cr2, CAIRO_OPERATOR_CLEAR);
+ cairo_paint (cr2);
+ } cairo_restore (cr2);
+
+ pattern = cairo_pattern_create_radial (
+ 0.5 * width, 0.5 * height, 0,
+ 0.5 * width, 0.5 * height, 0.5 *height);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.00, 0., 0., 0., 0.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.25, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.50, 1., 1., 1., .5);
+ cairo_pattern_add_color_stop_rgba (pattern, 1.00, 1., 1., 1., 1.);
+ cairo_set_source (cr2, pattern);
+ cairo_pattern_destroy (pattern);
+
+ cairo_mask_surface (cr2, mask2, 0, 0);
+ cairo_surface_destroy (mask2);
+ cairo_destroy (cr2);
+
+
+ cairo_set_source_rgb (cr, 0, 0, 1.0);
+ cairo_paint (cr);
+
+ cairo_set_source_rgb (cr, 1.0, 0, 0);
+ cairo_mask_surface (cr, mask, 0, 0);
+ cairo_surface_destroy (mask);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
+
diff --git a/test/smask-paint-ref.png b/test/smask-paint-ref.png
new file mode 100644
index 0000000..4381209
Binary files /dev/null and b/test/smask-paint-ref.png differ
diff --git a/test/smask-paint.c b/test/smask-paint.c
new file mode 100644
index 0000000..c075ade
--- /dev/null
+++ b/test/smask-paint.c
@@ -0,0 +1,90 @@
+/*
+ * 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
+ * Chris Wilson not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Chris Wilson makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL CHRIS WILSON 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 = {
+ "smask-paint",
+ "Test the support of \"soft\" masks with paints",
+ 60, 60,
+ draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ cairo_surface_t *mask;
+ cairo_pattern_t *pattern;
+ cairo_t *cr2;
+
+ mask = cairo_surface_create_similar (cairo_get_group_target (cr),
+ CAIRO_CONTENT_ALPHA,
+ width, height);
+ cr2 = cairo_create (mask);
+
+ cairo_save (cr2); {
+ cairo_set_operator (cr2, CAIRO_OPERATOR_CLEAR);
+ cairo_paint (cr2);
+ } cairo_restore (cr2);
+
+ pattern = cairo_pattern_create_linear (0, 0, width, height);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.00, 0., 0., 0., 0.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.25, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.50, 1., 1., 1., .5);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.75, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 1.00, 0., 0., 0., 0.);
+ cairo_set_source (cr2, pattern);
+ cairo_pattern_destroy (pattern);
+
+ cairo_paint (cr2);
+ cairo_destroy (cr2);
+
+ cairo_set_source_rgb (cr, 0, 0, 1.0);
+ cairo_paint (cr);
+
+ pattern = cairo_pattern_create_radial (
+ 0.5 * width, 0.5 * height, 0,
+ 0.5 * width, 0.5 * height, 0.5 *height);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.00, 0., 0., 0., 0.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.25, 1., 0., 0., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.50, 1., 0., 0., .5);
+ cairo_pattern_add_color_stop_rgba (pattern, 1.00, 1., 0., 0., 1.);
+ cairo_set_source (cr, pattern);
+ cairo_pattern_destroy (pattern);
+
+ cairo_mask_surface (cr, mask, 0, 0);
+ cairo_surface_destroy (mask);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
+
diff --git a/test/smask-ref.png b/test/smask-ref.png
new file mode 100644
index 0000000..2d98e43
Binary files /dev/null and b/test/smask-ref.png differ
diff --git a/test/smask-stroke-ref.png b/test/smask-stroke-ref.png
new file mode 100644
index 0000000..0d3f7fe
Binary files /dev/null and b/test/smask-stroke-ref.png differ
diff --git a/test/smask-stroke.c b/test/smask-stroke.c
new file mode 100644
index 0000000..c70825a
--- /dev/null
+++ b/test/smask-stroke.c
@@ -0,0 +1,83 @@
+/*
+ * 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
+ * Chris Wilson not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Chris Wilson makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL CHRIS WILSON 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 = {
+ "smask-stroke",
+ "Test the support of \"soft\" masks with strokes",
+ 60, 60,
+ draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ cairo_surface_t *mask;
+ cairo_pattern_t *pattern;
+ cairo_t *cr2;
+
+ mask = cairo_surface_create_similar (cairo_get_group_target (cr),
+ CAIRO_CONTENT_ALPHA,
+ width, height);
+ cr2 = cairo_create (mask);
+
+ cairo_save (cr2); {
+ cairo_set_operator (cr2, CAIRO_OPERATOR_CLEAR);
+ cairo_paint (cr2);
+ } cairo_restore (cr2);
+
+ pattern = cairo_pattern_create_linear (0, 0, width, height);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.00, 0., 0., 0., 0.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.25, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.50, 1., 1., 1., .5);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.75, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 1.00, 0., 0., 0., 0.);
+ cairo_set_source (cr2, pattern);
+ cairo_pattern_destroy (pattern);
+
+ cairo_arc (cr2, 0.5 * width, 0.5 * height, 0.4 * height, 0, 2 * M_PI);
+ cairo_stroke (cr2);
+ cairo_destroy (cr2);
+
+
+ cairo_set_source_rgb (cr, 0, 0, 1.0);
+ cairo_paint (cr);
+
+ cairo_set_source_rgb (cr, 1.0, 0, 0);
+ cairo_mask_surface (cr, mask, 0, 0);
+ cairo_surface_destroy (mask);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
+
diff --git a/test/smask-text-ref.png b/test/smask-text-ref.png
new file mode 100644
index 0000000..e5ca43f
Binary files /dev/null and b/test/smask-text-ref.png differ
diff --git a/test/smask-text.c b/test/smask-text.c
new file mode 100644
index 0000000..589c71d
--- /dev/null
+++ b/test/smask-text.c
@@ -0,0 +1,92 @@
+/*
+ * 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
+ * Chris Wilson not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Chris Wilson makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL CHRIS WILSON 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 = {
+ "smask-text",
+ "Test the support of \"soft\" masks with text",
+ 120, 60,
+ draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ cairo_surface_t *mask;
+ cairo_pattern_t *pattern;
+ cairo_t *cr2;
+ cairo_text_extents_t extents;
+
+ mask = cairo_surface_create_similar (cairo_get_group_target (cr),
+ CAIRO_CONTENT_ALPHA,
+ width, height);
+ cr2 = cairo_create (mask);
+
+ cairo_save (cr2); {
+ cairo_set_operator (cr2, CAIRO_OPERATOR_CLEAR);
+ cairo_paint (cr2);
+ } cairo_restore (cr2);
+
+ pattern = cairo_pattern_create_linear (0, 0, width, height);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.00, 0., 0., 0., 0.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.25, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.50, 1., 1., 1., .5);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.75, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 1.00, 0., 0., 0., 0.);
+ cairo_set_source (cr2, pattern);
+ cairo_pattern_destroy (pattern);
+
+ cairo_select_font_face (cr2,
+ "Bitstream Vera Sans",
+ CAIRO_FONT_SLANT_NORMAL,
+ CAIRO_FONT_WEIGHT_NORMAL);
+ cairo_set_font_size (cr2, 0.5 * height);
+
+ cairo_text_extents (cr2, "cairo", &extents);
+ cairo_move_to (cr2,
+ floor ((width - extents.width) / 2 + 0.5) - extents.x_bearing,
+ floor ((height - extents.height) / 2 - 0.5) - extents.y_bearing);
+ cairo_show_text (cr2, "cairo");
+ cairo_destroy (cr2);
+
+ cairo_set_source_rgb (cr, 0, 0, 1.0);
+ cairo_paint (cr);
+
+ cairo_set_source_rgb (cr, 1.0, 0, 0);
+ cairo_mask_surface (cr, mask, 0, 0);
+ cairo_surface_destroy (mask);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
+
diff --git a/test/smask.c b/test/smask.c
new file mode 100644
index 0000000..28eaed0
--- /dev/null
+++ b/test/smask.c
@@ -0,0 +1,130 @@
+/*
+ * 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
+ * Chris Wilson not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Chris Wilson makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * CHRIS WILSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL CHRIS WILSON 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 = {
+ "smask",
+ "Test the support of \"soft\" masks",
+ 60, 60,
+ draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ static uint32_t data[] = {
+ 0x80000000, 0x80000000,
+ 0x80000000, 0x80000000,
+ };
+
+ cairo_surface_t *mask, *mask2;
+ cairo_pattern_t *pattern;
+ cairo_t *cr2;
+ cairo_text_extents_t extents;
+
+ mask = cairo_surface_create_similar (cairo_get_group_target (cr),
+ CAIRO_CONTENT_ALPHA,
+ width, height);
+ cr2 = cairo_create (mask);
+
+ cairo_save (cr2); {
+ cairo_set_operator (cr2, CAIRO_OPERATOR_CLEAR);
+ cairo_paint (cr2);
+ } cairo_restore (cr2);
+
+ pattern = cairo_pattern_create_linear (0, 0, 0, height);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.00, 0., 0., 0., 0.0);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.80, 0., 0., 0., 0.0);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.90, 1., 1., 1., 0.25);
+ cairo_pattern_add_color_stop_rgba (pattern, 1.00, 1., 1., 1., 1.0);
+ cairo_set_source (cr2, pattern);
+ cairo_pattern_destroy (pattern);
+
+ cairo_paint (cr2);
+
+ pattern = cairo_pattern_create_linear (0, 0, width, height);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.00, 0., 0., 0., 0.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.25, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.50, 1., 1., 1., .5);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.75, 1., 1., 1., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 1.00, 0., 0., 0., 0.);
+ cairo_set_source (cr2, pattern);
+ cairo_pattern_destroy (pattern);
+
+ mask2 = cairo_image_surface_create_for_data ((unsigned char *) data,
+ CAIRO_FORMAT_ARGB32, 2, 2, 8);
+ pattern = cairo_pattern_create_for_surface (mask2);
+ cairo_surface_destroy (mask2);
+ cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+ cairo_mask (cr2, pattern);
+ cairo_pattern_destroy (pattern);
+
+ cairo_arc (cr2, 0.5 * width, 0.5 * height - 10, 0.2 * height, 0, 2 * M_PI);
+ cairo_fill (cr2);
+
+ cairo_arc (cr2, 0.5 * width, 0.5 * height - 10, 0.25 * height, 0, 2 * M_PI);
+ cairo_stroke (cr2);
+
+ cairo_select_font_face (cr2,
+ "Bitstream Vera Sans",
+ CAIRO_FONT_SLANT_NORMAL,
+ CAIRO_FONT_WEIGHT_NORMAL);
+ cairo_set_font_size (cr2, 0.3 * height);
+
+ cairo_text_extents (cr2, "FG", &extents);
+ cairo_move_to (cr2,
+ floor ((width - extents.width) / 2 + 0.5) - extents.x_bearing,
+ floor (height - extents.height - 0.5) - extents.y_bearing - 5);
+ cairo_show_text (cr2, "FG");
+ cairo_destroy (cr2);
+
+ cairo_set_source_rgb (cr, 0, 0, 1.0);
+ cairo_paint (cr);
+
+ pattern = cairo_pattern_create_radial (
+ 0.5 * width, 0.5 * height, 0,
+ 0.5 * width, 0.5 * height, 0.5 *height);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.00, 0., 0., 0., 0.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.25, 1., 0., 0., 1.);
+ cairo_pattern_add_color_stop_rgba (pattern, 0.50, 1., 0., 0., .5);
+ cairo_pattern_add_color_stop_rgba (pattern, 1.00, 1., 0., 0., 1.);
+ cairo_set_source (cr, pattern);
+ cairo_pattern_destroy (pattern);
+
+ cairo_mask_surface (cr, mask, 0, 0);
+ cairo_surface_destroy (mask);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
+
More information about the cairo-commit
mailing list