[cairo-commit] 6 commits - ROADMAP src/cairo-directfb.h src/cairo-nquartz.h src/cairo-pdf.h src/check-headers.sh src/Makefile.am

Behdad Esfahbod behdad at kemper.freedesktop.org
Mon Sep 18 10:32:48 PDT 2006


 ROADMAP              |    4 +++-
 src/Makefile.am      |    2 +-
 src/cairo-directfb.h |    3 ++-
 src/cairo-nquartz.h  |   10 +++++-----
 src/cairo-pdf.h      |    2 +-
 src/check-headers.sh |   21 +++++++++++++++++++++
 6 files changed, 33 insertions(+), 9 deletions(-)

New commits:
diff-tree ae355453d849f870fc67cae0442db49548df0103 (from 6c01b2ffb3c7a023f3932328b8067f4f5b83936c)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 18 13:32:41 2006 -0400

    cairo-nquartz.h: Add missing cairo_public decorators.

diff --git a/src/cairo-nquartz.h b/src/cairo-nquartz.h
index c8f981b..c6c58e7 100644
--- a/src/cairo-nquartz.h
+++ b/src/cairo-nquartz.h
@@ -46,29 +46,29 @@
 
 CAIRO_BEGIN_DECLS
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_nquartz_surface_create (cairo_format_t format,
                               unsigned int width,
                               unsigned int height);
 
 #ifdef CAIRO_NQUARTZ_SUPPORT_AGL
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_nquartz_surface_create_for_agl_context (AGLContext aglContext,
                                               unsigned int width,
                                               unsigned int height,
                                               cairo_bool_t y_grows_down);
 #endif
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_nquartz_surface_create_for_cg_context (CGContextRef cgContext,
                                              unsigned int width,
                                              unsigned int height,
                                              cairo_bool_t y_grows_down);
 
-cairo_bool_t
+cairo_public cairo_bool_t
 cairo_surface_is_nquartz (cairo_surface_t *surf);
 
-CGContextRef
+cairo_public CGContextRef
 cairo_nquartz_surface_get_cg_context (cairo_surface_t *surf);
 
 CAIRO_END_DECLS
diff-tree 6c01b2ffb3c7a023f3932328b8067f4f5b83936c (from 7bb72f645325960e0bef4595ed7e9f1bb391796c)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 18 13:32:19 2006 -0400

    cairo-directfb.h: Add missing cairo_public decorators

diff --git a/src/cairo-directfb.h b/src/cairo-directfb.h
index b777196..845f3de 100644
--- a/src/cairo-directfb.h
+++ b/src/cairo-directfb.h
@@ -43,7 +43,8 @@
 
 CAIRO_BEGIN_DECLS
 
-cairo_surface_t * cairo_directfb_surface_create (IDirectFB *dfb,IDirectFBSurface *surface);
+cairo_public cairo_surface_t *
+cairo_directfb_surface_create (IDirectFB *dfb,IDirectFBSurface *surface);
 
 CAIRO_END_DECLS
 
diff-tree 7bb72f645325960e0bef4595ed7e9f1bb391796c (from 01f10fb27a675ff26bb0c0ca6748479215e6d6bd)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 18 13:32:00 2006 -0400

    cairo-pdf.h: Add missing cairo_public decorators

diff --git a/src/cairo-pdf.h b/src/cairo-pdf.h
index 53699d4..52a8974 100644
--- a/src/cairo-pdf.h
+++ b/src/cairo-pdf.h
@@ -54,7 +54,7 @@ cairo_pdf_surface_create_for_stream (cai
 				     double		width_in_points,
 				     double		height_in_points);
 
-void
+cairo_public void
 cairo_pdf_surface_set_size (cairo_surface_t	*surface,
 			    double		 width_in_points,
 			    double		 height_in_points);
diff-tree 01f10fb27a675ff26bb0c0ca6748479215e6d6bd (from 38ed0eeb5bedb4af32bfc42b7f2b99b1805c8c17)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 18 13:28:29 2006 -0400

    check-headers.sh:  Add a test for cairo_public decorators in public headers
    Test fails currently because of bug 8313 and similar issues.

diff --git a/src/Makefile.am b/src/Makefile.am
index b61d291..a0e30ee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -281,7 +281,7 @@ install-data-local:
 	  false ;									\
         fi
 
-TESTS = check-def.sh check-plt.sh
+TESTS = check-def.sh check-plt.sh check-headers.sh
 EXTRA_DIST += $(TESTS)
 
 CLEANFILES = cairo.def cairo-features.h
diff --git a/src/check-headers.sh b/src/check-headers.sh
new file mode 100755
index 0000000..1e8d590
--- /dev/null
+++ b/src/check-headers.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+LANG=C
+
+test -z "$srcdir" && srcdir=.
+status=0
+
+echo Checking public headers for missing cairo_public decorators
+
+find "$srcdir" -name '*.h' -not -name '*-private.h' -not -name '*-test.h' -not -name 'cairoint.h' |
+xargs grep -B 1 '^cairo_.*[ 	]\+(' |
+awk '
+/^--$/ { context=""; public=0; next; }
+/:cairo_.*[ 	]+\(/ { if (!public) {print context; print; print "--";} next; }
+/-cairo_public\>/ {public=1;}
+{ context=$0; }
+' |
+sed 's/[.]h-/.h:/' |
+grep . && status=1
+
+exit $status
diff-tree 38ed0eeb5bedb4af32bfc42b7f2b99b1805c8c17 (from b9cbfba7d234c1cb66968d99cf527e1305febfea)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Sep 15 15:35:12 2006 -0400

    [ROADMAP] Add polling API

diff --git a/ROADMAP b/ROADMAP
index 1e42ba6..c985dfd 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -76,6 +76,8 @@ cairo 1.4.0 ideas (think performance!)
 
  User-font API
 
+ Polling API (cairo_get_serial and cairo_changed)
+
  Bugs to fix
  -----------
    CAIRO_EXTEND_PAD is not implemented for surface patterns
diff-tree b9cbfba7d234c1cb66968d99cf527e1305febfea (from 2fd0ad948931f4be43c81d2c4c56d264605bd737)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Sep 15 15:34:44 2006 -0400

    [ROADMAP] Check RGB16_565 deprecated

diff --git a/ROADMAP b/ROADMAP
index 2c55023..1e42ba6 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -79,7 +79,7 @@ cairo 1.4.0 ideas (think performance!)
  Bugs to fix
  -----------
    CAIRO_EXTEND_PAD is not implemented for surface patterns
-   CAIRO_FORMAT_RGB16_565 should be deprecated
+  ✓CAIRO_FORMAT_RGB16_565 should be deprecated
 
 For other ideas that have been proposed for cairo but are not yet
 scheduled on the roadmap of any particular release, please see the


More information about the cairo-commit mailing list