[cairo-commit] 8 commits - configure.in doc/public NEWS src/check-doc-syntax.sh test/extend-pad-similar.c test/Makefile.am

Carl Worth cworth at kemper.freedesktop.org
Wed Jan 30 05:36:30 PST 2008


 NEWS                      |  103 +++++++++++++++++++++++++++++++++++++++++++++
 configure.in              |    6 +-
 doc/public/Makefile.am    |    1 
 src/check-doc-syntax.sh   |    5 --
 test/Makefile.am          |    8 ++-
 test/extend-pad-similar.c |  105 ----------------------------------------------
 6 files changed, 113 insertions(+), 115 deletions(-)

New commits:
commit d08d5c421a45c4e5f30b308823e90a86f1ec2052
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jan 30 05:35:50 2008 -0800

    Increment cairo version to 1.5.9 after the 1.5.8 snapshot

diff --git a/configure.in b/configure.in
index 5ff575a..066dfe4 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ dnl For the micro number: odd => in-progress development (from git)
 dnl			  even => tar-file snapshot or release
 m4_define(cairo_version_major, 1)
 m4_define(cairo_version_minor, 5)
-m4_define(cairo_version_micro, 8)
+m4_define(cairo_version_micro, 9)
 
 AC_INIT([cairo],
       cairo_version_major.cairo_version_minor.cairo_version_micro,
commit 4ccb8cb29546432858e778e1b88cada1327f6f45
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jan 30 05:16:26 2008 -0800

    Add some more reference images to REFERENCE_IMAGES

diff --git a/test/Makefile.am b/test/Makefile.am
index ab52586..220ec73 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -331,6 +331,7 @@ REFERENCE_IMAGES = \
 	fill-rule-quartz-rgb24-ref.png	\
 	fill-rule-ref.png	\
 	fill-rule-rgb24-ref.png	\
+	fill-rule-ps-rgb24-ref.png \
 	filter-nearest-offset-ref.png	\
 	font-matrix-translation-ps-argb32-ref.png	\
 	font-matrix-translation-ps-rgb24-ref.png	\
@@ -381,6 +382,8 @@ REFERENCE_IMAGES = \
 	mask-svg-argb32-ref.png	\
 	meta-surface-pattern-ref.png		\
 	meta-surface-pattern-rgb24-ref.png	\
+	meta-surface-pattern-pdf-ref.png	\
+	meta-surface-pattern-pdf-rgb24-ref.png	\
 	miter-precision-ref.png \
 	move-to-show-surface-ref.png	\
 	new-sub-path-ps-argb32-ref.png	\
commit b31a7a904f8413c34970beabce6fecf6e1fdc925
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jan 30 05:13:53 2008 -0800

    Increment cairo version to 1.5.8 and libtool version to 16:0:14

diff --git a/configure.in b/configure.in
index 8077f8e..5ff575a 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ dnl For the micro number: odd => in-progress development (from git)
 dnl			  even => tar-file snapshot or release
 m4_define(cairo_version_major, 1)
 m4_define(cairo_version_minor, 5)
-m4_define(cairo_version_micro, 7)
+m4_define(cairo_version_micro, 8)
 
 AC_INIT([cairo],
       cairo_version_major.cairo_version_minor.cairo_version_micro,
@@ -26,7 +26,7 @@ dnl ===========================================================================
 # libtool shared library version
 
 # Increment if the interface has additions, changes, removals.
-LT_CURRENT=15
+LT_CURRENT=16
 
 # Increment any time the source changes; set to
 # 0 if you increment CURRENT
@@ -35,7 +35,7 @@ LT_REVISION=0
 # Increment if any interfaces have been added; set to 0
 # if any interfaces have been removed. removal has
 # precedence over adding, so set to 0 if both happened.
-LT_AGE=13
+LT_AGE=14
 
 dnl ===========================================================================
 
commit ca10920cc9f3a673e2199112541d5a1472423c47
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jan 30 05:07:20 2008 -0800

    Add a1-image-sample and a1-traps-sample reference images to the dist list

diff --git a/test/Makefile.am b/test/Makefile.am
index 8bfd56e..ab52586 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -230,6 +230,8 @@ endif
 
 # All tests which have a reference image go here.
 REFERENCE_IMAGES = \
+	a1-image-sample-ref.png		\
+	a1-traps-sample-ref.png		\
 	a8-mask-ref.png	\
 	bitmap-font-pdf-argb32-ref.png	\
 	bitmap-font-ref.png	\
commit 2fee01e2d40715defe9143456101533c1f1aafcf
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jan 30 04:54:39 2008 -0800

    check-doc-syntax.sh: Fix for non-srcdir builds (such as make distcheck)

diff --git a/src/check-doc-syntax.sh b/src/check-doc-syntax.sh
index 56ca8e5..16d5372 100755
--- a/src/check-doc-syntax.sh
+++ b/src/check-doc-syntax.sh
@@ -15,10 +15,7 @@ echo Checking documentation for incorrect syntax
 # Note: this test is also run from doc/public/ to check the SGML files
 
 if test "x$SGML_DOCS" = x; then
-	FILES="$cairo_all_source_file"
-	if test "x$FILES" = x; then
-		FILES=`find "$srcdir" -name '*.h' -or -name '*.c' -or -name '*.cpp'`
-	fi
+    FILES=`find "$srcdir" -name '*.h' -or -name '*.c' -or -name '*.cpp'`
 fi
 
 enum_regexp='\([^%@]\|^\)\<\(FALSE\|TRUE\|NULL\|CAIRO_[0-9A-Z_]*[^(0-9A-Z_]\)'
commit 78022f3aa16cf8a629aec4595c5a542ca68a78cc
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jan 30 04:54:05 2008 -0800

    Add doc/public test scripts to EXTRA_DIST
    
    This prevents failures of make distcheck

diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am
index bf80aac..faca782 100644
--- a/doc/public/Makefile.am
+++ b/doc/public/Makefile.am
@@ -74,3 +74,4 @@ check: doc
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" top_srcdir="$(top_srcdir)" MAKE="$(MAKE)"
 TESTS = check-doc-coverage.sh check-doc-syntax.sh
+EXTRA_DIST += $(TESTS)
commit d49b1220b2feeca82050de05c9c01012e8420acb
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jan 30 04:52:23 2008 -0800

    Remove extend-pad-similar test case
    
    This seems redundant with the recent testing of all test cases
    against similar surfaces. Plus, it hasn't had a reference image
    anyway which was causing problems with the recent extra checks
    for missing reference images.

diff --git a/test/Makefile.am b/test/Makefile.am
index a425e91..8bfd56e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -38,7 +38,6 @@ degenerate-pen$(EXEEXT)					\
 device-offset$(EXEEXT)					\
 device-offset-positive$(EXEEXT)				\
 extend-pad$(EXEEXT)					\
-extend-pad-similar$(EXEEXT)				\
 extend-reflect$(EXEEXT)					\
 extend-reflect-similar$(EXEEXT)				\
 extend-repeat$(EXEEXT)					\
@@ -303,7 +302,6 @@ REFERENCE_IMAGES = \
 	device-offset-ref.png	\
 	device-offset-rgb24-ref.png	\
 	extend-pad-ref.png	\
-	extend-pad-similar-ref.png	\
 	extend-reflect-ref.png	\
 	extend-reflect-similar-ref.png	\
 	extend-repeat-ref.png	\
@@ -528,7 +526,6 @@ $(REFERENCE_IMAGES)
 XFAIL_TESTS =					\
 big-trap$(EXEEXT)				\
 extend-pad$(EXEEXT)				\
-extend-pad-similar$(EXEEXT)			\
 filter-nearest-offset$(EXEEXT)			\
 long-lines$(EXEEXT)				\
 self-intersecting$(EXEEXT)			\
diff --git a/test/extend-pad-similar.c b/test/extend-pad-similar.c
deleted file mode 100644
index d523f54..0000000
--- a/test/extend-pad-similar.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright © 2007 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Author: Behdad Esfahbod <behdad at behdad.org>
- */
-
-#include "cairo-test.h"
-
-#define SIZE 90
-
-static cairo_test_draw_function_t draw;
-
-cairo_test_t test = {
-    "extend-pad-similar",
-    "Test CAIRO_EXTEND_PAD for surface patterns",
-    SIZE, SIZE,
-    draw
-};
-
-static cairo_surface_t *
-create_source_surface (cairo_surface_t *target)
-{
-    const int surface_size = (SIZE - 30) / 10;
-    cairo_surface_t *surface;
-    cairo_t *cr;
-
-    /* Create an image surface with my favorite four colors in each
-     * quadrant. */
-    surface = cairo_surface_create_similar (target, CAIRO_CONTENT_COLOR,
-					    surface_size, surface_size);
-    cr = cairo_create (surface);
-    cairo_set_source_rgb (cr, 1, 1, 1);
-    cairo_rectangle (cr,
-		     0, 0,
-		     surface_size / 2, surface_size / 2);
-    cairo_fill (cr);
-    cairo_set_source_rgb (cr, 1, 0, 0);
-    cairo_rectangle (cr,
-		     surface_size / 2, 0,
-		     surface_size / 2, surface_size / 2);
-    cairo_fill (cr);
-    cairo_set_source_rgb (cr, 0, 1, 0);
-    cairo_rectangle (cr,
-		     0, surface_size / 2,
-		     surface_size / 2, surface_size / 2);
-    cairo_fill (cr);
-    cairo_set_source_rgb (cr, 0, 0, 1);
-    cairo_rectangle (cr,
-		     surface_size / 2, surface_size / 2,
-		     surface_size / 2, surface_size / 2);
-    cairo_fill (cr);
-    cairo_destroy (cr);
-
-    return surface;
-}
-
-static cairo_test_status_t
-draw (cairo_t *cr, int width, int height)
-{
-    cairo_surface_t *surface;
-
-    surface = create_source_surface (cairo_get_group_target (cr));
-
-    cairo_set_source_rgba (cr, 0, 0, 0, 1);
-    cairo_rectangle (cr, 0, 0, SIZE, SIZE);
-    cairo_fill (cr);
-
-    cairo_scale (cr, 10, 10);
-    cairo_set_source_surface (cr, surface, 1.5, 1.5);
-    cairo_surface_destroy (surface);
-
-    cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_PAD);
-    cairo_rectangle (cr, 1.5, 1.5, 6, 6);
-    cairo_clip (cr);
-
-    cairo_paint (cr);
-
-    return CAIRO_TEST_SUCCESS;
-}
-
-int
-main (void)
-{
-    return cairo_test (&test);
-}
commit 7d2fda54f9bf6ae48cf8048b4836dea7f20cccee
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jan 30 04:23:19 2008 -0800

    NEWS: Add notes for the 1.5.8 snapshot

diff --git a/NEWS b/NEWS
index e07f3b4..6d58391 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,106 @@
+Snapshot 1.5.8 (2008-01-30 Carl Worth <cworth at cworth.org>)
+==========================================================
+This is the fourth snapshot in cairo's unstable 1.5 series. It comes 2
+weeks after the 1.5.6 snapshot. It adds a few new API functions. Most
+notably all callers of cairo_image_surface_create_for_data should now
+be calling cairo_format_stride_for_width to compute a legal stride
+value. See below for more details.
+
+New API in cairo 1.5.8
+----------------------
+We've added a new function that should be called to compute a legal
+stride value before allocating data to be used with
+cairo_image_surface_create_for_data:
+
+	int
+	cairo_format_stride_for_width (cairo_format_t	format,
+				       int		width);
+
+We've also added a new cairo_path_extents function that can be used to
+compute a bounding box for geometry such as a single line segment,
+(contrast with cairo_path_extents and cairo_stroke_extents):
+
+	void
+	cairo_path_extents (cairo_t *cr,
+			    double *x1, double *y1,
+			    double *x2, double *y2);
+
+And finally, we've added a function to allow for querying the
+XRenderPictFormat of a cairo-xlib surface:
+
+	XRenderPictFormat *
+	cairo_xlib_surface_get_xrender_format (cairo_surface_t *surface);
+
+API changes
+-----------
+Fix return types of cairo_surface_show_page and
+cairo_surface_copy_page. This is an API change to functions that are
+new in the 1.5 series, so not an API break compared to any stable
+cairo release, (1.0.x, 1.2.x, 1.4.x).
+
+Change the return type of cairo_get_current_point() from void to
+cairo_status_t. This allows the caller to receive a
+CAIRO_STATUS_NO_CURRENT_POINT value to distinguish the a current point
+at the origin from no current point existing.
+
+Performance improvement
+-----------------------
+Improve performance of clipping by using an optimized code path
+internally, (with the ADD operator instead of IN).
+
+General bug fixes
+-----------------
+Fix various cairo_*_extents functions to initialize the return-value
+variables even in the case of a cairo_t in error.
+
+Treat NULL as a legitimate value for cairo_font_options_t*. [XXX: On
+discussion afterwards, we decided against this change so we plan to
+remove this again before 1.6.0]
+
+Fix rendering with CAIRO_ANTIALIAS_NONE to be more predictable, (that
+is, to avoid seams appearing when geometry and imagery share an
+identical edge). Portions of this fix are in the pixman library and
+will appear in a future release of that library.
+
+Avoid triggering an error for a font size of 0.
+
+Miscellaneous changes
+---------------------
+Require pixman >= 0.9.6.
+
+There has been a tremendous amount improvement to cairo's
+documentation. We're delighted that 100% of the public API has at
+least some documentation in the API reference manual. Many thanks to
+Behdad Esfahbod and Nis Martensen for leading this effort.
+
+cairo-pdf and cairo-ps
+----------------------
+Eliminate failure when a Type 1 font is embedded with an explicit
+glyph 0.
+
+cairo-pdf
+---------
+Implement a more correct and more efficient approach for patterns with
+an extend mode of CAIRO_EXTEND_REFLECT.
+
+cairo-ps
+--------
+Fix image masks to properly pack and pad mask bits.
+
+cairo-quartz
+------------
+Take care to only use DrawTiledImage for integer-aligned images, (and
+use slower paths to get the correct result in other cases).
+
+cairo-win32
+-----------
+Fix for older versions of mingw.
+
+Improve the handling of the clipping with the win32 and win32-printing
+surfaces.
+
+Fix rendering of non black/white text.
+
 Snapshot 1.5.6 (2008-01-15 Carl Worth <cworth at cworth.org>)
 ==========================================================
 This is the third snapshot in cairo's unstable 1.5 series. It comes


More information about the cairo-commit mailing list