[cairo-commit] 3 commits - autogen.sh boilerplate/cairo-boilerplate.c test/device-offset-fractional.c test/device-offset-fractional-ref.png test/.gitignore test/Makefile.am
Chris Wilson
ickle at kemper.freedesktop.org
Mon Sep 15 09:40:33 PDT 2008
autogen.sh | 1
boilerplate/cairo-boilerplate.c | 5 +-
test/.gitignore | 1
test/Makefile.am | 2
test/device-offset-fractional-ref.png |binary
test/device-offset-fractional.c | 80 ++++++++++++++++++++++++++++++++++
6 files changed, 87 insertions(+), 2 deletions(-)
New commits:
commit b24d2e4214cc7a7ec59f6c6c2033b7315626f3f0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Sep 15 17:17:30 2008 +0100
[autogen] Delete Makefile.am.config
Cause the Makefile.am.config to be regenerated every time as its contents
may be invalid for the current run - e.g. if a developer is switching
between branches with experimental surfaces.
diff --git a/autogen.sh b/autogen.sh
index 800640a..99dd84a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -170,6 +170,7 @@ do_cmd $ACLOCAL $ACLOCAL_FLAGS
do_cmd $AUTOHEADER
# create dummy src/Makefile.am.config and ChangeLog to make automake happy
+rm -f src/Makefile.am.config
touch src/Makefile.am.config
touch ChangeLog
commit 5c7c2b5187800fd09e659305d58f61f4945e62a5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Sep 15 17:06:13 2008 +0100
[test] Test handling of fractional device offsets.
diff --git a/test/.gitignore b/test/.gitignore
index 9e3bd22..374bbf5 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -53,6 +53,7 @@ degenerate-arc
degenerate-path
degenerate-pen
device-offset
+device-offset-fractional
device-offset-positive
device-offset-scale
extend-pad
diff --git a/test/Makefile.am b/test/Makefile.am
index 1ebc145..2a27310 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -43,6 +43,7 @@ degenerate-arc$(EXEEXT) \
degenerate-path$(EXEEXT) \
degenerate-pen$(EXEEXT) \
device-offset$(EXEEXT) \
+device-offset-fractional$(EXEEXT) \
device-offset-positive$(EXEEXT) \
device-offset-scale$(EXEEXT) \
extend-pad$(EXEEXT) \
@@ -382,6 +383,7 @@ REFERENCE_IMAGES = \
degenerate-path-rgb24-ref.png \
degenerate-path-quartz-ref.png \
degenerate-path-quartz-rgb24-ref.png \
+ device-offset-fractional-ref.png \
device-offset-positive-ref.png \
device-offset-positive-rgb24-ref.png \
device-offset-ref.png \
diff --git a/test/device-offset-fractional-ref.png b/test/device-offset-fractional-ref.png
new file mode 100644
index 0000000..9250d33
Binary files /dev/null and b/test/device-offset-fractional-ref.png differ
diff --git a/test/device-offset-fractional.c b/test/device-offset-fractional.c
new file mode 100644
index 0000000..d301541
--- /dev/null
+++ b/test/device-offset-fractional.c
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2006 Red Hat, Inc.
+ * 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
+ * Red Hat, Inc. 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.
+ *
+ * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL RED HAT, INC. 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: Carl D. Worth <cworth at cworth.org>
+ * Chris Wilson <chris at chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+#define SIZE 10
+#define PAD 4
+#define COUNT 4
+
+static cairo_test_draw_function_t draw;
+
+static const cairo_test_t test = {
+ "device-offset-fractional",
+ "Test using image surfaces with fractional device-offsets as sources.",
+ COUNT*(SIZE+PAD+.5)+PAD, COUNT*(SIZE+PAD+.5)+PAD,
+ draw
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ cairo_surface_t *surface;
+ cairo_t *cr2;
+ int i,j;
+
+ /* Fill the background */
+ cairo_set_source_rgb (cr, 1, 1, 1); /* white */
+ cairo_paint (cr);
+
+ surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, SIZE, SIZE);
+ cr2 = cairo_create (surface);
+ cairo_surface_destroy (surface);
+
+ cairo_set_source_rgb (cr2, 0, 0, 1); /* blue */
+ cairo_paint (cr2);
+
+ cairo_set_source_surface (cr, cairo_get_target (cr2), 0, 0);
+ cairo_destroy (cr2);
+
+ for (i = 0; i < COUNT; i++) {
+ for (j = 0; j < COUNT; j++) {
+ cairo_surface_set_device_offset (surface,
+ -i*(SIZE+PAD+.5)-PAD,
+ -j*(SIZE+PAD+.5)-PAD);
+ cairo_paint (cr);
+ }
+ }
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
commit 2617d68a7b7ccaa8d82fe225926a1bf5f160ed30
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Sep 15 17:07:11 2008 +0100
[boilerplate] Restrict number of retries to create an error surface.
Sometimes we just cannot get what we want, so give up - it's only an error
surface after all!
diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c
index c32b09b..f7146b7 100644
--- a/boilerplate/cairo-boilerplate.c
+++ b/boilerplate/cairo-boilerplate.c
@@ -643,6 +643,7 @@ cairo_surface_t *
cairo_boilerplate_surface_create_in_error (cairo_status_t status)
{
cairo_surface_t *surface = NULL;
+ int loop = 5;
do {
cairo_surface_t *intermediate;
@@ -657,9 +658,9 @@ cairo_boilerplate_surface_create_in_error (cairo_status_t status)
cairo_append_path (cr, &path);
cairo_surface_destroy (surface);
- surface = cairo_get_target (cr);
+ surface = cairo_surface_reference (cairo_get_target (cr));
cairo_destroy (cr);
- } while (cairo_surface_status (surface) != status);
+ } while (cairo_surface_status (surface) != status && --loop);
return surface;
}
More information about the cairo-commit
mailing list