[cairo-commit] Branch '1.10' - 7 commits - build/configure.ac.features configure.ac src/cairo-arc.c src/cairo.c src/cairo-gl-shaders.c src/cairo-xcb-surface.c test/COPYING
Chris Wilson
ickle at kemper.freedesktop.org
Fri Nov 26 02:33:41 PST 2010
build/configure.ac.features | 2 +-
configure.ac | 6 +++---
src/cairo-arc.c | 4 ++++
src/cairo-gl-shaders.c | 4 ++--
src/cairo-xcb-surface.c | 10 ++++------
src/cairo.c | 1 +
test/COPYING | 13 +++++++++++++
7 files changed, 28 insertions(+), 12 deletions(-)
New commits:
commit 841a2df7359e2b491aed7ed8c043cce669357ae3
Author: Markus Stange <mstange at themasta.com>
Date: Fri Nov 5 09:23:44 2010 +0100
Fix type of _cairo_memory_stream_destroy parameter
In 9b9952ab4f64a476bbadfd3e6cf1e66c1137ccd7
_cairo_memory_stream_destroy was changed to take an unsigned long
instead of unsigned int, and the two callsites in cairo-gl-shaders.c
weren't updated.
diff --git a/src/cairo-gl-shaders.c b/src/cairo-gl-shaders.c
index d7773f5..ea329dd 100644
--- a/src/cairo-gl-shaders.c
+++ b/src/cairo-gl-shaders.c
@@ -632,7 +632,7 @@ cairo_gl_shader_get_vertex_source (cairo_gl_var_type_t src,
{
cairo_output_stream_t *stream = _cairo_memory_stream_create ();
unsigned char *source;
- unsigned int length;
+ unsigned long length;
cairo_status_t status;
cairo_gl_shader_emit_variable (stream, src, CAIRO_GL_TEX_SOURCE);
@@ -768,7 +768,7 @@ cairo_gl_shader_get_fragment_source (GLuint tex_target,
{
cairo_output_stream_t *stream = _cairo_memory_stream_create ();
unsigned char *source;
- unsigned int length;
+ unsigned long length;
cairo_status_t status;
cairo_gl_shader_emit_color (stream, tex_target, src, CAIRO_GL_TEX_SOURCE);
commit b6a97499c71af60a3f15d131d51eb53fb21b48ff
Author: Andrea Canciani <ranma42 at gmail.com>
Date: Tue Oct 5 10:36:38 2010 +0200
xcb: Do not return value in void function
Sun Studio Compiler complains:
"cairo-xcb-surface.c", line 585: void function cannot return value
even if the returned value is void.
Some minor code restructuring removes the issue.
diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index 9c2d3a7..d852f50 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -580,12 +580,10 @@ _cairo_xcb_surface_release_source_image (void *abstract_surface,
{
cairo_xcb_surface_t *surface = abstract_surface;
- if (surface->drm != NULL && ! surface->marked_dirty) {
- return _cairo_surface_release_source_image (surface->drm,
- image, image_extra);
- }
-
- cairo_surface_destroy (&image->base);
+ if (surface->drm != NULL && !surface->marked_dirty)
+ _cairo_surface_release_source_image (surface->drm, image, image_extra);
+ else
+ cairo_surface_destroy (&image->base);
}
static cairo_bool_t
commit e71588c80d5c6112fa9f7c6ea369d90f9284199f
Author: Andrea Canciani <ranma42 at gmail.com>
Date: Sun Oct 24 16:40:53 2010 +0200
test: Add romedalen images copyright information
romedalen.png and romedalen.jpg have been bundled into the test
suite without an explicit copyright notice.
diff --git a/test/COPYING b/test/COPYING
index dd528d1..3db71fb 100644
--- a/test/COPYING
+++ b/test/COPYING
@@ -11,3 +11,16 @@ are as follows:
Font License Distinguishing feature
-------- ------------- ----------------------
6x13.pcf Public Domain Bitmap font
+
+
+The test suite also bundles some images for use by the test suite. The
+images included, their licenses, and why we use them in the test suite
+are as follows:
+
+ Image License Distinguishing feature
+ ------------- ------------- -------------------------
+ romedalen.jpg Public Domain Bitmap image (image/jpeg)
+ romedalen.png Public Domain Bitmap image (image/png)
+
+The kind contributors of the bundled files are (in alphabetical order):
+Øyvind Kolås <pippin at freedesktop.org> Author of the original romedalen shot.
commit 2b3d8de11a536d668084ea6d2bf295da1d1cdc11
Author: Andrea Canciani <ranma42 at gmail.com>
Date: Sat Oct 16 22:51:28 2010 +0200
Fix degenerate arcs
Make sure that degenerate arcs become a move_to-line_to sequence
instead of just a move_to.
Fixes get-path-extents.
diff --git a/src/cairo-arc.c b/src/cairo-arc.c
index 56d42f1..1b2713f 100644
--- a/src/cairo-arc.c
+++ b/src/cairo-arc.c
@@ -231,6 +231,10 @@ _cairo_arc_in_direction (cairo_t *cr,
angle,
angle + angle_step);
}
+ } else {
+ cairo_line_to (cr,
+ xc + radius * cos (angle_min),
+ yc + radius * sin (angle_min));
}
}
diff --git a/src/cairo.c b/src/cairo.c
index 157f898..5117f8a 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -1852,6 +1852,7 @@ cairo_arc (cairo_t *cr,
/* Do nothing, successfully, if radius is <= 0 */
if (radius <= 0.0) {
+ cairo_line_to (cr, xc, yc); /* might become a move_to */
cairo_line_to (cr, xc, yc);
return;
}
commit fafca7ace250e3f4f9c60584f0ddff187c690068
Author: Joerg Sonnenberger <joerg at NetBSD.org>
Date: Tue Oct 12 22:07:37 2010 +0200
LD_PRELOAD is supported on DragonFly.
diff --git a/configure.ac b/configure.ac
index f918c62..1238f5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -708,7 +708,7 @@ dnl The tracing utility requires LD_PRELOAD, so only build it for systems
dnl that are known to work.
case $host in
-*-linux*|*-*bsd*|*-solaris*|*-*-darwin*)
+*-linux*|*-*bsd*|*-solaris*|*-*-darwin*|*-dragonfly*)
have_ld_preload="yes"
;;
*)
commit c20d55eb1c1eb1c6f51a21c7eb205ba4c2c125e8
Author: Erik Zeek <zeekec at mad.scientist.com>
Date: Thu Nov 4 17:57:03 2010 +0100
Fix build on gentoo
The problem is probably caused by a change in the behavior of autoconf
(2.67).
See http://bugs.gentoo.org/336329
diff --git a/configure.ac b/configure.ac
index 2c14ae2..f918c62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,12 +3,12 @@ CAIRO_PARSE_VERSION
AC_INIT([cairo],
[cairo_version_major.cairo_version_minor.cairo_version_micro],
[http://bugs.freedesktop.org/enter_bug.cgi?product=cairo])
+AC_CONFIG_AUX_DIR(build)
+AC_CONFIG_MACRO_DIR(build)
AC_GNU_SOURCE
AC_USE_SYSTEM_EXTENSIONS
AC_CONFIG_SRCDIR(src/cairo.h)
AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_AUX_DIR(build)
-AC_CONFIG_MACRO_DIR(build)
AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL
commit 8ef5161da307361e20dad68df74512c5afcbb012
Author: Andrea Canciani <ranma42 at gmail.com>
Date: Sat Nov 6 15:46:48 2010 +0100
configure: Correct reporting of tee backend
Since 9f33f8453b4949cfdc63169d3acd7238f89379c2 tee is not compiled in
anymore by default. Reporting it as always enabled is misleading.
diff --git a/build/configure.ac.features b/build/configure.ac.features
index 825fd96..dc3c8b8 100644
--- a/build/configure.ac.features
+++ b/build/configure.ac.features
@@ -365,7 +365,7 @@ AC_DEFUN([CAIRO_REPORT],
echo "The following surface backends:"
echo " Image: yes (always builtin)"
echo " Recording: yes (always builtin)"
- echo " Tee: yes (always builtin)"
+ echo " Tee: $use_tee"
echo " XML: $use_xml"
echo " Skia: $use_skia"
echo " Xlib: $use_xlib"
More information about the cairo-commit
mailing list