[cairo-commit] 6 commits - cairo-version.h NEWS test/in-fill-empty-trapezoid.c test/Makefile.am

Carl Worth cworth at kemper.freedesktop.org
Thu Oct 15 16:24:53 PDT 2009


 NEWS                           |    3 +--
 cairo-version.h                |    2 +-
 test/Makefile.am               |   20 +++++++++++++-------
 test/in-fill-empty-trapezoid.c |    4 ++--
 4 files changed, 17 insertions(+), 12 deletions(-)

New commits:
commit c739940137c4ffc6cc727ea30afc0e92f7ab1e80
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Oct 15 16:24:44 2009 -0700

    Increment version to 1.9.5
    
    Just after the 1.9.4 snapshot.

diff --git a/cairo-version.h b/cairo-version.h
index 1ee9b77..c9012bf 100644
--- a/cairo-version.h
+++ b/cairo-version.h
@@ -3,6 +3,6 @@
 
 #define CAIRO_VERSION_MAJOR 1
 #define CAIRO_VERSION_MINOR 9
-#define CAIRO_VERSION_MICRO 4
+#define CAIRO_VERSION_MICRO 5
 
 #endif
commit ad6334b9870c63e641b531d6e910c084b587d0f9
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Oct 15 15:33:20 2009 -0700

    Add mising images to REFERENCE_IMAGES list.
    
    Again, the kind of thing that only gets fixed at release time.
    But at least we have a nice test for this.

diff --git a/test/Makefile.am b/test/Makefile.am
index 8c36e65..d7813f7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -143,6 +143,8 @@ REFERENCE_IMAGES = \
 	alpha-similar.svg.argb32.xfail.png \
 	alpha-similar.svg.rgb24.xfail.png \
 	big-line.ref.png \
+	big-line.xlib-fallback.ref.png \
+	big-line.xlib.ref.png \
 	bilevel-image.ref.png \
 	bitmap-font.ref.png \
 	bitmap-font.rgb24.ref.png \
@@ -514,6 +516,8 @@ REFERENCE_IMAGES = \
 	ft-text-vertical-layout-type3.svg.ref.png \
 	ft-text-vertical-layout-type3.xlib.ref.png \
 	get-group-target.ref.png \
+	glitz-surface-source.argb32.ref.png \
+	glitz-surface-source.rgb24.ref.png \
 	glitz-surface-source.ps2.ref.png \
 	glitz-surface-source.ps3.ref.png \
 	glyph-cache-pressure.ps2.ref.png \
@@ -820,6 +824,8 @@ REFERENCE_IMAGES = \
 	rotated-clip.xlib.ref.png \
 	scale-down-source-surface-paint.ref.png \
 	scale-offset-image.gl.ref.png \
+	scale-offset-image.pdf.argb32.ref.png \
+	scale-offset-image.pdf.rgb24.ref.png \
 	scale-offset-image.ps.ref.png \
 	scale-offset-image.ref.png \
 	scale-offset-image.xfail.png \
@@ -827,6 +833,8 @@ REFERENCE_IMAGES = \
 	scale-offset-image.xlib.xfail.png \
 	scale-offset-image.xlib-fallback.xfail.png \
 	scale-offset-similar.gl.ref.png \
+	scale-offset-similar.pdf.argb32.ref.png \
+	scale-offset-similar.pdf.rgb24.ref.png \
 	scale-offset-similar.ps.ref.png \
 	scale-offset-similar.ref.png \
 	scale-offset-similar.xfail.png \
commit cdad5e10768978b11088f82858a1e6e0037dc0a7
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Oct 15 14:58:39 2009 -0700

    Mark in-fill-empty-trapezoid as an XFAIL test.
    
    Otherwise, it was disrupting my attempts to release a snapshot, (since
    it doesn't respect CAIRO_TEST_TARGET=" " and not run like most of the
    tests do).

diff --git a/test/Makefile.am b/test/Makefile.am
index ac9d62f..8c36e65 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1086,6 +1086,10 @@ $(REFERENCE_IMAGES)
 #                         room, with Carl as a moderator and not let them out
 #                         until they have come up with an interface and
 #                         semantics that actually work. :-)
+# in-fill-empty-trapezoid The cairo_in_fill () function can sometimes
+#                         produce false positives when the tessellator
+#                         produces empty trapezoids and the query
+#                         point lands exactly on a trapezoid edge.
 # long-lines            - range overflow of fixed-point
 # scale-offset-image    - loss of precision converting a cairo matrix to
 # scale-offset-similar    pixman's fixed point format.
@@ -1109,6 +1113,7 @@ degenerate-path$(EXEEXT)			\
 device-offset-scale$(EXEEXT)			\
 extend-pad$(EXEEXT)				\
 fallback-resolution$(EXEEXT)			\
+in-fill-empty-trapezoid$(EXEEXT)		\
 long-lines$(EXEEXT)				\
 self-copy-overlap$(EXEEXT)			\
 self-intersecting$(EXEEXT)			\
diff --git a/test/in-fill-empty-trapezoid.c b/test/in-fill-empty-trapezoid.c
index 15ef01d..2b345cb 100644
--- a/test/in-fill-empty-trapezoid.c
+++ b/test/in-fill-empty-trapezoid.c
@@ -83,14 +83,14 @@ preamble (cairo_test_context_t *ctx)
     if (CAIRO_STATUS_SUCCESS != status) {
 	cairo_test_log (ctx, "Failed to create a test surface and path: %s\n",
 			cairo_status_to_string (status));
-	ret = CAIRO_TEST_FAILURE;
+	ret = CAIRO_TEST_XFAILURE;
     }
 
     if (0 != false_positive_count) {
 	cairo_test_log (ctx, "Point sampling found %d false positives "
 			"from cairo_in_fill()\n",
 			false_positive_count);
-	ret = CAIRO_TEST_FAILURE;
+	ret = CAIRO_TEST_XFAILURE;
     }
 
     return ret;
commit b0f309abb33fb7e068199c941835af0217d8d1fc
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Oct 15 14:40:22 2009 -0700

    Update version to 1.9.4
    
    In preparation for the 1.9.4 snapshot.

diff --git a/cairo-version.h b/cairo-version.h
index 0ee7b34..1ee9b77 100644
--- a/cairo-version.h
+++ b/cairo-version.h
@@ -3,6 +3,6 @@
 
 #define CAIRO_VERSION_MAJOR 1
 #define CAIRO_VERSION_MINOR 9
-#define CAIRO_VERSION_MICRO 3
+#define CAIRO_VERSION_MICRO 4
 
 #endif
commit 3b113275f8b081685227fc073c03f64bb1a229d3
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Oct 15 14:17:30 2009 -0700

    Remove stale references to non-existant reference images.
    
    This is just one of those things that we don't get right until
    someone tries running "make distcheck".

diff --git a/test/Makefile.am b/test/Makefile.am
index 9ad41f5..ac9d62f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -143,9 +143,6 @@ REFERENCE_IMAGES = \
 	alpha-similar.svg.argb32.xfail.png \
 	alpha-similar.svg.rgb24.xfail.png \
 	big-line.ref.png \
-	big-line.ps.ref.png \
-	big-line.xlib.png \
-	big-line.xlib-fallback.png \
 	bilevel-image.ref.png \
 	bitmap-font.ref.png \
 	bitmap-font.rgb24.ref.png \
@@ -519,7 +516,6 @@ REFERENCE_IMAGES = \
 	get-group-target.ref.png \
 	glitz-surface-source.ps2.ref.png \
 	glitz-surface-source.ps3.ref.png \
-	glitz-surface-source.ref.png \
 	glyph-cache-pressure.ps2.ref.png \
 	glyph-cache-pressure.ps3.ref.png \
 	glyph-cache-pressure.quartz.ref.png \
@@ -824,7 +820,6 @@ REFERENCE_IMAGES = \
 	rotated-clip.xlib.ref.png \
 	scale-down-source-surface-paint.ref.png \
 	scale-offset-image.gl.ref.png \
-	scale-offset-image.pdf.ref.png \
 	scale-offset-image.ps.ref.png \
 	scale-offset-image.ref.png \
 	scale-offset-image.xfail.png \
@@ -832,7 +827,6 @@ REFERENCE_IMAGES = \
 	scale-offset-image.xlib.xfail.png \
 	scale-offset-image.xlib-fallback.xfail.png \
 	scale-offset-similar.gl.ref.png \
-	scale-offset-similar.pdf.ref.png \
 	scale-offset-similar.ps.ref.png \
 	scale-offset-similar.ref.png \
 	scale-offset-similar.xfail.png \
@@ -937,7 +931,6 @@ REFERENCE_IMAGES = \
 	svg-surface-source.svg12.argb32.xfail.png \
 	svg-surface-source.svg12.rgb24.xfail.png \
 	test-fallback16-surface-source.ps.ref.png \
-	test-fallback16-surface-source.ref.png \
 	test-fallback16-surface-source.svg12.argb32.xfail.png \
 	test-fallback16-surface-source.svg12.rgb24.xfail.png \
 	text-antialias-gray.quartz.ref.png \
commit 37078b262a268179f8b7a3dfdc263e1a403daa7d
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Oct 15 14:11:04 2009 -0700

    NEWS: Update with correct data for 1.9.4 snapshot

diff --git a/NEWS b/NEWS
index 6fdd064..f5db417 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Snapshot 1.9.4 (2009-07-xx)
+Snapshot 1.9.4 (2009-10-15)
 ===========================
 API additions:
 
@@ -91,7 +91,6 @@ Special thanks:
    To the AuroraUX team for providing access to one of their OpenSolaris
    machines for cairo and pixman development.  http://www.auroraux.org/
 
-
 Snapshot 1.9.2 (2009-06-12)
 ===========================
 API additions:


More information about the cairo-commit mailing list