[cairo-commit] 6 commits - configure.in doc/public NEWS src/Makefile.am test/get-xrender-format.c test/xlib-surface.c test/xlib-surface-source.c

Behdad Esfahbod behdad at kemper.freedesktop.org
Mon Aug 11 12:19:42 PDT 2008


 NEWS                                    |    8 ++++++++
 configure.in                            |    6 +++---
 doc/public/tmpl/cairo-font-options.sgml |   18 +++++++++---------
 doc/public/tmpl/cairo-status.sgml       |    4 ++--
 doc/public/tmpl/cairo-text.sgml         |   24 ++++++++++++------------
 src/Makefile.am                         |    1 +
 test/get-xrender-format.c               |    2 +-
 test/xlib-surface-source.c              |    4 ++++
 test/xlib-surface.c                     |    2 +-
 9 files changed, 41 insertions(+), 28 deletions(-)

New commits:
commit 75acb51a0940916f545f0ffba99ccf7669d0d745
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Aug 11 15:19:28 2008 -0400

    [configure.in] Post release version increment to 1.7.5

diff --git a/configure.in b/configure.in
index 1d2c4c3..73e9446 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, 7)
-m4_define(cairo_version_micro, 4)
+m4_define(cairo_version_micro, 5)
 
 AC_INIT([cairo],
       cairo_version_major.cairo_version_minor.cairo_version_micro,
commit 012a12a67b66f3809fa203f91ff8920936c25361
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Aug 11 13:54:55 2008 -0400

    [configure.in,NEWS] Release 1.7.4

diff --git a/NEWS b/NEWS
index c0bca68..42853eb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Release 1.7.4 (2008-08-11 Behdad Esfahbod <behdad at behdad.org>)
+==============================================================
+The cairo community is embarrassed to announce availability of the 1.7.4
+snapshot of the cairo graphics library.  This is a followup release to the
+1.7.2 snapshot to ship a tarball that can actually be built.  The only
+change since 1.7.4 is including the missing header file
+cairo-user-font-private.h in the distribution.
+
 Release 1.7.2 (2008-08-11 Behdad Esfahbod <behdad at behdad.org>)
 ==============================================================
 The cairo community is finally ready to announce availability of the 1.7.2
diff --git a/configure.in b/configure.in
index 9b88fd5..1d2c4c3 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, 7)
-m4_define(cairo_version_micro, 3)
+m4_define(cairo_version_micro, 4)
 
 AC_INIT([cairo],
       cairo_version_major.cairo_version_minor.cairo_version_micro,
@@ -27,7 +27,7 @@ dnl ===========================================================================
 # libtool shared library version
 
 # Increment if the interface has additions, changes, removals.
-m4_define(LT_CURRENT, 21)
+m4_define(LT_CURRENT, 22)
 
 # Increment any time the source changes; set to
 # 0 if you increment CURRENT
@@ -36,7 +36,7 @@ m4_define(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.
-m4_define(LT_AGE, 19)
+m4_define(LT_AGE, 20)
 
 dnl ===========================================================================
 
commit b176b5c29d931bfab16601dcb89dd6b6728bc386
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Aug 11 15:06:10 2008 -0400

    [test/get-xrender-format.c] Don't fail if DISPLAY is not set

diff --git a/test/get-xrender-format.c b/test/get-xrender-format.c
index 6678249..9dec1d9 100644
--- a/test/get-xrender-format.c
+++ b/test/get-xrender-format.c
@@ -47,7 +47,7 @@ main (void)
 	cairo_test_log ("Error: Cannot open display: %s.\n",
 			XDisplayName (NULL));
 	cairo_test_fini ();
-	return CAIRO_TEST_UNTESTED;
+	return CAIRO_TEST_SUCCESS;
     }
 
     screen = DefaultScreen (dpy);
diff --git a/test/xlib-surface.c b/test/xlib-surface.c
index eda085f..4bac497 100644
--- a/test/xlib-surface.c
+++ b/test/xlib-surface.c
@@ -306,7 +306,7 @@ main (void)
     if (!dpy) {
 	cairo_test_log ("xlib-surface: Cannot open display, skipping\n");
 	cairo_test_fini ();
-	return 0;
+	return CAIRO_TEST_SUCCESS;
     }
 
     if (!check_visual (dpy)) {
commit bbd5f03fd8b04b92c9f8f06a386894d88650c0b4
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Aug 11 14:28:00 2008 -0400

    [test/xlib-surface-source] Skip test if DISPLAY not set

diff --git a/test/xlib-surface-source.c b/test/xlib-surface-source.c
index 192dadc..3c33516 100644
--- a/test/xlib-surface-source.c
+++ b/test/xlib-surface-source.c
@@ -61,6 +61,10 @@ create_source_surface (int size)
     data = xmalloc (sizeof (struct closure));
 
     data->dpy = XOpenDisplay (NULL);
+    if (!data->dpy) {
+	return NULL;
+    }
+
     xrender_format = XRenderFindStandardFormat (data->dpy, PictStandardARGB32);
 
     data->pix = XCreatePixmap (data->dpy, DefaultRootWindow (data->dpy),
commit 5d307b58b9a056ee866ea56305900f2eaa88441a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Aug 11 13:54:39 2008 -0400

    [doc] More template changes.  Donno why they keep changing.

diff --git a/doc/public/tmpl/cairo-font-options.sgml b/doc/public/tmpl/cairo-font-options.sgml
index 42d9b76..62a6b30 100644
--- a/doc/public/tmpl/cairo-font-options.sgml
+++ b/doc/public/tmpl/cairo-font-options.sgml
@@ -142,19 +142,19 @@ output on a particular display.
 
 </para>
 
- at CAIRO_LCD_FILTER_DEFAULT:
- at CAIRO_LCD_FILTER_NONE:
- at CAIRO_LCD_FILTER_INTRA_PIXEL:
- at CAIRO_LCD_FILTER_FIR3:
- at CAIRO_LCD_FILTER_FIR5:
+ at CAIRO_LCD_FILTER_DEFAULT: 
+ at CAIRO_LCD_FILTER_NONE: 
+ at CAIRO_LCD_FILTER_INTRA_PIXEL: 
+ at CAIRO_LCD_FILTER_FIR3: 
+ at CAIRO_LCD_FILTER_FIR5: 
 
 <!-- ##### FUNCTION cairo_font_options_set_lcd_filter ##### -->
 <para>
 
 </para>
 
- at options:
- at lcd_filter:
+ at options: 
+ at lcd_filter: 
 
 
 <!-- ##### FUNCTION cairo_font_options_get_lcd_filter ##### -->
@@ -162,8 +162,8 @@ output on a particular display.
 
 </para>
 
- at options:
- at Returns:
+ at options: 
+ at Returns: 
 
 
 <!-- ##### ENUM cairo_hint_style_t ##### -->
diff --git a/doc/public/tmpl/cairo-status.sgml b/doc/public/tmpl/cairo-status.sgml
index 7d65bd5..fcc17a9 100644
--- a/doc/public/tmpl/cairo-status.sgml
+++ b/doc/public/tmpl/cairo-status.sgml
@@ -68,8 +68,8 @@ code is required before or after each individual cairo function call.
 @CAIRO_STATUS_USER_FONT_ERROR: 
 @CAIRO_STATUS_NEGATIVE_COUNT: 
 @CAIRO_STATUS_INVALID_CLUSTERS: 
- at CAIRO_STATUS_INVALID_SLANT:
- at CAIRO_STATUS_INVALID_WEIGHT:
+ at CAIRO_STATUS_INVALID_SLANT: 
+ at CAIRO_STATUS_INVALID_WEIGHT: 
 
 <!-- ##### FUNCTION cairo_status_to_string ##### -->
 <para>
diff --git a/doc/public/tmpl/cairo-text.sgml b/doc/public/tmpl/cairo-text.sgml
index 54fb9bd..0883f27 100644
--- a/doc/public/tmpl/cairo-text.sgml
+++ b/doc/public/tmpl/cairo-text.sgml
@@ -50,7 +50,7 @@ Cairo has two sets of text rendering capabilities:
 
 </para>
 
- at index:
+ at index: 
 @x: 
 @y: 
 
@@ -196,7 +196,7 @@ Cairo has two sets of text rendering capabilities:
 </para>
 
 @cr: 
- at Returns:
+ at Returns: 
 
 
 <!-- ##### FUNCTION cairo_show_text_glyphs ##### -->
@@ -249,10 +249,10 @@ Cairo has two sets of text rendering capabilities:
 
 </para>
 
- at family:
- at slant:
- at weight:
- at Returns:
+ at family: 
+ at slant: 
+ at weight: 
+ at Returns: 
 
 
 <!-- ##### FUNCTION cairo_toy_font_face_get_family ##### -->
@@ -260,8 +260,8 @@ Cairo has two sets of text rendering capabilities:
 
 </para>
 
- at font_face:
- at Returns:
+ at font_face: 
+ at Returns: 
 
 
 <!-- ##### FUNCTION cairo_toy_font_face_get_slant ##### -->
@@ -269,8 +269,8 @@ Cairo has two sets of text rendering capabilities:
 
 </para>
 
- at font_face:
- at Returns:
+ at font_face: 
+ at Returns: 
 
 
 <!-- ##### FUNCTION cairo_toy_font_face_get_weight ##### -->
@@ -278,8 +278,8 @@ Cairo has two sets of text rendering capabilities:
 
 </para>
 
- at font_face:
- at Returns:
+ at font_face: 
+ at Returns: 
 
 
 <!-- ##### FUNCTION cairo_glyph_allocate ##### -->
commit 2c53acea0bc474fb46310384da5df0b32a675181
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Aug 11 13:54:26 2008 -0400

    [src/Makefile.am] Include missing header file

diff --git a/src/Makefile.am b/src/Makefile.am
index 2c8a0d0..24694fc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,7 @@ cairo_base_sources =				\
 	cairo-surface-private.h			\
 	cairo-traps.c				\
 	cairo-user-font.c			\
+	cairo-user-font-private.h		\
 	cairo-unicode.c				\
 	cairo-output-stream.c			\
 	cairo-output-stream-private.h		\


More information about the cairo-commit mailing list