[cairo-commit] 3 commits - src/cairo-png.c test/filter-bilinear-extents.c test/.gitignore test/group-paint.c test/group-paint-ref.png test/Makefile.am
Chris Wilson
ickle at kemper.freedesktop.org
Tue Apr 8 12:19:19 PDT 2008
src/cairo-png.c | 6 ++++
test/.gitignore | 1
test/Makefile.am | 2 +
test/filter-bilinear-extents.c | 2 +
test/group-paint-ref.png |binary
test/group-paint.c | 57 +++++++++++++++++++++++++++++++++++++++++
6 files changed, 68 insertions(+)
New commits:
commit 089bf98df1708b77e0a66f52abb83856a93eff9d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Apr 8 15:33:47 2008 +0100
[test] Add group-paint
The experience of running the entire test suite under cairo_push_group()
did at least reveal that there was a potential bug in the pdf backend.
This test is just the simplest of drawing operations - simply filling
the similar surface with solid blue, and then blitting that surface to
the destination.
diff --git a/test/.gitignore b/test/.gitignore
index 9d2587b..575ae6e 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -84,6 +84,7 @@ glitz-surface-source
glyph-cache-pressure
gradient-alpha
gradient-zero-stops
+group-paint
imagediff
image-surface-source
infinite-join
diff --git a/test/Makefile.am b/test/Makefile.am
index faf82f0..4ede4e3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -64,6 +64,7 @@ get-group-target$(EXEEXT) \
get-path-extents$(EXEEXT) \
gradient-alpha$(EXEEXT) \
gradient-zero-stops$(EXEEXT) \
+group-paint$(EXEEXT) \
image-surface-source$(EXEEXT) \
infinite-join$(EXEEXT) \
in-fill-empty-trapezoid$(EXEEXT) \
@@ -425,6 +426,7 @@ REFERENCE_IMAGES = \
gradient-alpha-rgb24-ref.png \
gradient-zero-stops-ref.png \
gradient-zero-stops-rgb24-ref.png \
+ group-paint-ref.png \
image-surface-source-ref.png \
infinite-join-ref.png \
infinite-join-ps-ref.png \
diff --git a/test/group-paint-ref.png b/test/group-paint-ref.png
new file mode 100644
index 0000000..f2e111b
Binary files /dev/null and b/test/group-paint-ref.png differ
diff --git a/test/group-paint.c b/test/group-paint.c
new file mode 100644
index 0000000..bfc23e4
--- /dev/null
+++ b/test/group-paint.c
@@ -0,0 +1,57 @@
+/*
+ * Copyright © Chris Wilson, 2008
+ *
+ * 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. Red Hat, Inc. 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.
+ *
+ * Authors: Chris Wilson <chris at chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+static cairo_test_draw_function_t draw;
+
+cairo_test_t test = {
+ "group-paint",
+ "test push_group(); pop_group_to_source(); set_operator(SOURCE); paint();",
+ 10, 10,
+ draw
+};
+
+
+static cairo_test_status_t
+draw (cairo_t *cr, int dst_width, int dst_height)
+{
+ cairo_push_group (cr);
+
+ cairo_set_source_rgb (cr, 0, 0, 1);
+ cairo_paint (cr);
+
+ cairo_pop_group_to_source (cr);
+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+ cairo_paint (cr);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
commit 39100439cad575b3c542bbe31eaea699ff76b3c8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Apr 8 11:32:51 2008 +0100
Check surface->status and finished in cairo_surface_write_to_png_stream
Cut'n'paste from commit c1f765:
Without these checks, a user could hit an assertion failure by passing
a finished surface to cairo_surface_write_to_png_stream. Now we return
a nice CAIRO_STATUS_SURFACE_FINISHED error in that case instead.
diff --git a/src/cairo-png.c b/src/cairo-png.c
index ad04570..0db4b09 100644
--- a/src/cairo-png.c
+++ b/src/cairo-png.c
@@ -351,6 +351,12 @@ cairo_surface_write_to_png_stream (cairo_surface_t *surface,
{
struct png_write_closure_t png_closure;
+ if (surface->status)
+ return surface->status;
+
+ if (surface->finished)
+ return _cairo_error (CAIRO_STATUS_SURFACE_FINISHED);
+
png_closure.write_func = write_func;
png_closure.closure = closure;
commit 935b0bbf6e260180298dcd5643b5db3fde7af1fd
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Apr 8 10:57:51 2008 +0100
[test/filter-bilinear-extents] Memleak.
Destroy the temporary image surface.
diff --git a/test/filter-bilinear-extents.c b/test/filter-bilinear-extents.c
index a39a37c..0a95556 100644
--- a/test/filter-bilinear-extents.c
+++ b/test/filter-bilinear-extents.c
@@ -81,6 +81,8 @@ draw (cairo_t *cr, int width, int height)
cairo_paint (cr);
cairo_restore (cr);
+ cairo_surface_destroy (checker);
+
return CAIRO_TEST_SUCCESS;
}
More information about the cairo-commit
mailing list