From 6c6d0d6b78d538387b552a9150ba0ceb49163f38 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Sat, 25 Apr 2015 17:39:16 +0100 Subject: [PATCH] fix some compiler warnings --- ChangeLog | 3 +++ configure.ac | 4 ++-- libvips/deprecated/vips7compat.c | 2 +- libvips/include/vips/object.h | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 144f813d..8a68571a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +25/4/15 started 8.0.1 +- fix some compiler warnings + 11/2/15 started 8.0 - remove old doc stuff, lots of doc improvements - add fliphor(), flipver(), rot90(), rot180(), rot270(), median(), dilate(), diff --git a/configure.ac b/configure.ac index 25b9334e..df1a4d60 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # also update the version number in the m4 macros below -AC_INIT([vips], [8.0.0], [vipsip@jiscmail.ac.uk]) +AC_INIT([vips], [8.0.1], [vipsip@jiscmail.ac.uk]) # required for gobject-introspection AC_PREREQ(2.62) @@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4]) # user-visible library versioning m4_define([vips_major_version], [8]) m4_define([vips_minor_version], [0]) -m4_define([vips_micro_version], [0]) +m4_define([vips_micro_version], [1]) m4_define([vips_version], [vips_major_version.vips_minor_version.vips_micro_version]) diff --git a/libvips/deprecated/vips7compat.c b/libvips/deprecated/vips7compat.c index d2cd6907..612be800 100644 --- a/libvips/deprecated/vips7compat.c +++ b/libvips/deprecated/vips7compat.c @@ -1155,7 +1155,7 @@ im_copy_set_meta( IMAGE *in, IMAGE *out, const char *field, GValue *value ) { if( vips_image_write( in, out ) ) return( -1 ); - im_meta_set( out, field, value ); + (void) im_meta_set( out, field, value ); return( 0 ); } diff --git a/libvips/include/vips/object.h b/libvips/include/vips/object.h index 703476d9..4123a526 100644 --- a/libvips/include/vips/object.h +++ b/libvips/include/vips/object.h @@ -628,8 +628,7 @@ VipsObject **vips_object_local_array( VipsObject *parent, int n ); void vips_object_local_cb( VipsObject *vobject, GObject *gobject ); #define vips_object_local( V, G ) \ - (g_signal_connect( V, "close", \ - G_CALLBACK( vips_object_local_cb ), G ), 0) + (g_signal_connect( V, "close", G_CALLBACK( vips_object_local_cb ), G )) void vips_object_set_static( VipsObject *object, gboolean static_object ); void vips_object_print_all( void );