From 63be2e1a080718731f9333548759f3890d6da6c9 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Sun, 8 Apr 2012 10:13:10 +0100 Subject: [PATCH] fix warning for unused vips7 gvalue arg this fixes this warning: $ vips im_copy_set_meta GLib-GObject-CRITICAL **: g_value_unset: assertion `G_IS_VALUE (value)' failed --- ChangeLog | 1 + libvips/deprecated/dispatch_types.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9412c4e3..86d32188 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 6/4/12 started 7.28.3 - vips_divide() failed for int arguments +- fix warning for unused vips7 gvalue argument 13/3/12 started 7.28.2 - xres/yres tiffsave args were broken diff --git a/libvips/deprecated/dispatch_types.c b/libvips/deprecated/dispatch_types.c index d354dca5..72147afe 100644 --- a/libvips/deprecated/dispatch_types.c +++ b/libvips/deprecated/dispatch_types.c @@ -817,7 +817,11 @@ gvalue_free( im_object obj ) { GValue *value = obj; - g_value_unset( value ); + /* If it's just zeros (built but not used) we'll get an error if we + * unset(). + */ + if( G_IS_VALUE( value ) ) + g_value_unset( value ); return( 0 ); }