[cairo-commit] 5 commits - cairo-version.h NEWS src/cairo-fontconfig-private.h src/cairo-skia.h src/glew test/api-special-cases.c test/Makefile.am
Chris Wilson
ickle at kemper.freedesktop.org
Mon Jul 12 04:38:14 PDT 2010
NEWS | 56 +++++++++++++++++++++++++++++++++++++++++
cairo-version.h | 2 -
src/cairo-fontconfig-private.h | 2 +
src/cairo-skia.h | 2 -
src/glew/GL/glew.h | 2 +
src/glew/GL/glxew.h | 2 +
test/Makefile.am | 3 ++
test/api-special-cases.c | 5 ++-
8 files changed, 70 insertions(+), 4 deletions(-)
New commits:
commit 53ee897449dca497d6a3d6dc90b87fea8027cc44
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Jul 12 12:37:31 2010 +0100
version: Post-snapshot bump to 1.9.13
diff --git a/cairo-version.h b/cairo-version.h
index 0935854..2ab71a0 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 12
+#define CAIRO_VERSION_MICRO 13
#endif
commit aa4cd8287f47b4538e765e1b48dcbac19813a8a2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Jul 12 12:12:12 2010 +0100
version: 1.9.12 snapshot
diff --git a/cairo-version.h b/cairo-version.h
index 436592b..0935854 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 11
+#define CAIRO_VERSION_MICRO 12
#endif
commit 53b129dd8aecf4e2bd8b7d2cd27b91370c6705e9
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Jul 12 12:11:42 2010 +0100
NEWS for 1.9.12.
diff --git a/NEWS b/NEWS
index 6320226..deb5528 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,59 @@
+Snapshot 1.9.12 (2010-07-12)
+============================
+
+ A couple of weeks spent fixing those annoying bugs and cleaning up the build
+ system; the list of outstanding tasks to complete for the stable release is
+ finally shrinking. The chief bug fixer has been Benjamin Otte who not only
+ made sure that the public API is consistent and being tested for its
+ consistency, but also ensured that the documentation was up-to-date and
+ spent time clarifying cases where even the Cairo developers have come
+ unstuck in the past. Many thanks, Benjamin. However, he was not alone,
+ as Andrea Canciani continued his fine work in isolating broken corner cases
+ and proceeding to fix them, and tidying up the quartz backend. And last, but
+ definitely not least, M Joonas Pihlaja tried building Cairo across a
+ perverse range of systems and fixed up all the loose bits of code that came
+ unravelled. Thanks everybody!
+
+API Changes
+-----------
+
+ cairo_surface_set_mime_data, cairo_surface_get_mime_data:
+
+ The length parameter is now an unsigned long (as opposed to an unsigned
+ int). The parameter is intended to be an equivalent to a size_t without
+ requiring POSIX types and be large enough to store the size of the
+ largest possible allocation.
+
+ cairo_gl_surface_create_for_texture:
+
+ This a new surface constructor for cairo-gl that explicitly enables
+ render-to-texture for foreign, i.e. application, textures.
+
+ cairo_region_xor, cairo_region_xor_rectangle
+
+ A couple of utility routines add to the region handling interface for
+ the purpose of replacing existing GdkRegion functionality.
+
+Bugs fixes
+----------
+
+ https://bugs.launchpad.net/ubuntu/+source/cairo/+bug/600622
+
+ Inkscape was caught in the act of attempting to modify a finished surface.
+ Unfortunately, we had the ordering of our guards and assertions wrong and
+ so an ordinary application error was triggering an assert in Cairo. This
+ lead Benjamin to add a test case to ensure that the entire public API
+ could handle erroneous input and then proceeded to fix a whole slew of
+ uncovered bugs.
+
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=28888
+
+ A regression introduced by the special casing of uploading images to an
+ xlib surface in-place which was ignoring the translation applied to the
+ image.
+
+
Snapshot 1.9.10 (2010-06-26)
============================
commit 01380f3a56b28a388d2876780f33516ecd16ee16
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Jul 12 11:49:53 2010 +0100
test: Missing REFERENCE_IMAGES
diff --git a/test/Makefile.am b/test/Makefile.am
index 54815f7..cfb8104 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -152,6 +152,7 @@ REFERENCE_IMAGES = \
alpha-similar.rgb24.ref.png \
alpha-similar.svg.argb32.xfail.png \
alpha-similar.svg.rgb24.xfail.png \
+ api-special-cases.ref.png \
big-line.ref.png \
big-line.image16.ref.png \
big-line.ps.ref.png \
@@ -693,10 +694,12 @@ REFERENCE_IMAGES = \
halo.image16.ref.png \
halo.xlib.ref.png \
halo.ps.ref.png \
+ halo.quartz.ref.png \
halo-transform.ref.png \
halo-transform.image16.ref.png \
halo-transform.xlib.ref.png \
halo-transform.ps.ref.png \
+ halo-transform.quartz.ref.png \
huge-linear.image16.ref.png \
huge-linear.pdf.ref.png \
huge-linear.ps3.ref.png \
commit 459b8ae660eb49a87ffb9da31f305718a2b4f11f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Jul 12 11:05:57 2010 +0100
Make distcheck happy.
diff --git a/src/cairo-fontconfig-private.h b/src/cairo-fontconfig-private.h
index 7e29f69..ea873ab 100644
--- a/src/cairo-fontconfig-private.h
+++ b/src/cairo-fontconfig-private.h
@@ -42,6 +42,8 @@
#ifndef _CAIRO_FONTCONFIG_PRIVATE_H
#define _CAIRO_FONTCONFIG_PRIVATE_H
+#include "cairo.h"
+
#if CAIRO_HAS_FC_FONT
#include <fontconfig/fontconfig.h>
#include <fontconfig/fcfreetype.h>
diff --git a/src/cairo-skia.h b/src/cairo-skia.h
index 033ba6d..f628235 100644
--- a/src/cairo-skia.h
+++ b/src/cairo-skia.h
@@ -39,7 +39,7 @@
#include "cairo.h"
-#ifdef CAIRO_HAS_SKIA_SURFACE
+#if CAIRO_HAS_SKIA_SURFACE
CAIRO_BEGIN_DECLS
diff --git a/src/glew/GL/glew.h b/src/glew/GL/glew.h
index cd38410..86e0600 100644
--- a/src/glew/GL/glew.h
+++ b/src/glew/GL/glew.h
@@ -29,6 +29,8 @@
** THE POSSIBILITY OF SUCH DAMAGE.
*/
+//#include "cairo.h" /* keep distcheck happy */
+
/*
* Mesa 3-D graphics library
* Version: 7.0
diff --git a/src/glew/GL/glxew.h b/src/glew/GL/glxew.h
index a29030d..d3933cd 100644
--- a/src/glew/GL/glxew.h
+++ b/src/glew/GL/glxew.h
@@ -29,6 +29,8 @@
** THE POSSIBILITY OF SUCH DAMAGE.
*/
+//#include "cairo.h" /* keep distcheck happy */
+
/*
* Mesa 3-D graphics library
* Version: 7.0
diff --git a/test/api-special-cases.c b/test/api-special-cases.c
index 42e3bd8..63eb5d0 100644
--- a/test/api-special-cases.c
+++ b/test/api-special-cases.c
@@ -206,7 +206,8 @@ test_cairo_surface_set_mime_data (cairo_surface_t *surface)
status = cairo_surface_set_mime_data (surface,
mimetype,
- (const unsigned char *) data, strlen (data),
+ (const unsigned char *) data,
+ strlen (data),
NULL, NULL);
return status ? CAIRO_TEST_SUCCESS : CAIRO_TEST_ERROR;
}
@@ -216,7 +217,7 @@ test_cairo_surface_get_mime_data (cairo_surface_t *surface)
{
const char *mimetype = "text/x-uri";
const unsigned char *data;
- unsigned int length;
+ unsigned long length;
cairo_surface_get_mime_data (surface, mimetype, &data, &length);
return data == NULL && length == 0 ? CAIRO_TEST_SUCCESS : CAIRO_TEST_ERROR;
More information about the cairo-commit
mailing list