[cairo-commit] 2 commits - configure.in Makefile.am src/cairo-directfb-surface.c src/cairoint.h src/cairo-meta-surface-private.h src/cairo-type1-fallback.c src/cairo-types-private.h

Chris Wilson ickle at kemper.freedesktop.org
Wed Oct 10 06:58:00 PDT 2007


 Makefile.am                      |    6 +++---
 configure.in                     |    2 +-
 src/cairo-directfb-surface.c     |   16 ++++++++--------
 src/cairo-meta-surface-private.h |    2 +-
 src/cairo-type1-fallback.c       |    2 +-
 src/cairo-types-private.h        |    7 +++----
 src/cairoint.h                   |    5 +++++
 7 files changed, 22 insertions(+), 18 deletions(-)

New commits:
diff-tree 0b65c301a72836f46cdcda8b8fa1e995100c7727 (from b8d7d62b08576364c8c402490b6f5e4a1472d5d8)
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Oct 9 23:17:42 2007 +0100

    [Makefile.am] Change lcov-clean to use more portable constructs.
    
    Replace xargs and rm with the binaries found by configure and drop the
    passing of NUL-terminated strings as that is a GNU extension.

diff --git a/Makefile.am b/Makefile.am
index 6dd6d94..a47920f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,9 +41,9 @@ genlcov:
 	rm -f cairo-lcov.info.tmp
 
 lcov-clean:
-	$(LTP) --directory $(top_builddir) -z
-	$(RM) -rf cairo-lcov.info cairo-lcov
-	$(FIND) -name '*.gcda' -print0 | xargs -0 rm
+	-$(LTP) --directory $(top_builddir) -z
+	-$(RM) -rf cairo-lcov.info cairo-lcov
+	-$(FIND) -name '*.gcda' -print | ${XARGS} ${RM}
 
 EXTRA_DIST = \
 	AUTHORS \
diff-tree b8d7d62b08576364c8c402490b6f5e4a1472d5d8 (from 7e6ac74de17cf82f224d9f5fad3ad60e92d7690b)
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Oct 9 23:12:52 2007 +0100

    Fix some trivial syntax warnings for -ansi.
    
    gcc -ansi -pedantic gives a few syntax warnings, principally for use of
    '//' comments and a comma at the end of enumerators. Apply these
    corrections as they are trivial.

diff --git a/configure.in b/configure.in
index 7c76397..59a7375 100644
--- a/configure.in
+++ b/configure.in
@@ -702,7 +702,7 @@ MAYBE_WARN="-Wall -Wextra \
 -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
 -Wdeclaration-after-statement -Wold-style-definition \
 -Wno-missing-field-initializers -Wno-unused-parameter \
--Wno-attributes"
+-Wno-attributes -Wno-long-long -Winline"
 
 
 # invalidate cached value if MAYBE_WARN has changed
diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
index b79f8e2..e6f354f 100644
--- a/src/cairo-directfb-surface.c
+++ b/src/cairo-directfb-surface.c
@@ -68,7 +68,7 @@
 #define DFB_SHOW_GLYPHS 1
 
 
-D_DEBUG_DOMAIN (Cairo_DirectFB, "Cairo/DirectFB", "Cairo DirectFB backend");
+D_DEBUG_DOMAIN (Cairo_DirectFB, "Cairo/DirectFB", "Cairo DirectFB backend")
 
 /*****************************************************************************/
 
@@ -530,12 +530,12 @@ _cairo_directfb_surface_release_dest_ima
     buffer->Unlock (buffer);
 
     if (surface->dfbsurface != buffer) {
-        DFBRegion region = { x1:interest_rect->x, y1:interest_rect->y,
-                x2:interest_rect->x+interest_rect->width-1,
-                y2:interest_rect->y+interest_rect->height-1 };
+        DFBRegion region = { .x1 = interest_rect->x, .y1 = interest_rect->y,
+                .x2 = interest_rect->x+interest_rect->width-1,
+                .y2 = interest_rect->y+interest_rect->height-1 };
         surface->dfbsurface->SetClip (surface->dfbsurface, &region);
-        //surface->dfbsurface->SetBlittingFlags (surface->dfbsurface,
-         //               DSBLIT_BLEND_ALPHACHANNEL | DSBLIT_COLORIZE);
+        /* surface->dfbsurface->SetBlittingFlags (surface->dfbsurface,
+                        DSBLIT_BLEND_ALPHACHANNEL | DSBLIT_COLORIZE); */
         surface->dfbsurface->Blit (surface->dfbsurface,buffer,NULL,
                         image_rect->x,image_rect->y);
         buffer->Release (buffer);
@@ -666,7 +666,7 @@ _directfb_prepare_composite (cairo_direc
             if (sblend == DSBF_ONE) {
                 flags |= DSBLIT_BLEND_ALPHACHANNEL;                   
                 sblend = DSBF_SRCALPHA;
-                //dblend = DSBF_INVSRCALPHA;
+                /* dblend = DSBF_INVSRCALPHA; */
             }
         }
             
@@ -1227,7 +1227,7 @@ _directfb_allocate_font_cache (IDirectFB
         return NULL;
     }
 
-    //dfb->AddRef (dfb);
+    /* dfb->AddRef (dfb); */
     cache->dfb = dfb;
 
     cache->width  = width;
diff --git a/src/cairo-meta-surface-private.h b/src/cairo-meta-surface-private.h
index a3360e6..80d8b79 100644
--- a/src/cairo-meta-surface-private.h
+++ b/src/cairo-meta-surface-private.h
@@ -61,7 +61,7 @@ typedef enum {
 typedef enum {
     CAIRO_META_REGION_ALL,
     CAIRO_META_REGION_NATIVE,
-    CAIRO_META_REGION_IMAGE_FALLBACK,
+    CAIRO_META_REGION_IMAGE_FALLBACK
 } cairo_meta_region_type_t;
 
 typedef struct _cairo_command_header {
diff --git a/src/cairo-type1-fallback.c b/src/cairo-type1-fallback.c
index 24fb4d1..37aa22c 100644
--- a/src/cairo-type1-fallback.c
+++ b/src/cairo-type1-fallback.c
@@ -41,7 +41,7 @@
 
 typedef enum {
     CAIRO_CHARSTRING_TYPE1,
-    CAIRO_CHARSTRING_TYPE2,
+    CAIRO_CHARSTRING_TYPE2
 } cairo_charstring_type_t;
 
 typedef struct _cairo_type1_font {
diff --git a/src/cairo-types-private.h b/src/cairo-types-private.h
index 45491f7..a7af712 100644
--- a/src/cairo-types-private.h
+++ b/src/cairo-types-private.h
@@ -54,7 +54,6 @@ typedef struct _cairo_paginated_surface_
 typedef struct _cairo_scaled_font_backend   cairo_scaled_font_backend_t;
 typedef struct _cairo_font_face_backend     cairo_font_face_backend_t;
 typedef struct _cairo_xlib_screen_info cairo_xlib_screen_info_t;
-typedef enum _cairo_paginated_mode cairo_paginated_mode_t;
 typedef cairo_array_t cairo_user_data_array_t;
 
 /**
@@ -122,10 +121,10 @@ struct _cairo_cache {
     int freeze_count;
 };
 
-enum _cairo_paginated_mode {
+typedef enum _cairo_paginated_mode {
     CAIRO_PAGINATED_MODE_ANALYZE,	/* analyze page regions */
     CAIRO_PAGINATED_MODE_RENDER		/* render page contents */
-};
+} cairo_paginated_mode_t;
 
 /* Sure wish C had a real enum type so that this would be distinct
    from cairo_status_t. Oh well, without that, I'll use this bogus 1000
@@ -137,7 +136,7 @@ typedef enum _cairo_int_status {
     CAIRO_INT_STATUS_CACHE_EMPTY,
     CAIRO_INT_STATUS_FLATTEN_TRANSPARENCY,
     CAIRO_INT_STATUS_IMAGE_FALLBACK,
-    CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN,
+    CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN
 } cairo_int_status_t;
 
 typedef enum _cairo_internal_surface_type {
diff --git a/src/cairoint.h b/src/cairoint.h
index c5cdf1a..caabef4 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -74,6 +74,11 @@
 #define inline __inline
 #endif
 
+#ifdef __STRICT_ANSI__
+#undef inline
+#define inline __inline__
+#endif
+
 CAIRO_BEGIN_DECLS
 
 #undef MIN


More information about the cairo-commit mailing list