From 2eb91cabac770e79a9d4cfbd56fca7aacb8ebbb3 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Thu, 31 May 2012 17:46:25 +0100 Subject: [PATCH] synv --- libvips/iofuncs/object.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libvips/iofuncs/object.c b/libvips/iofuncs/object.c index cfaa260f..46e3b065 100644 --- a/libvips/iofuncs/object.c +++ b/libvips/iofuncs/object.c @@ -366,8 +366,7 @@ vips_argument_map( VipsObject *object, VipsArgument *argument = (VipsArgument *) argument_class; GParamSpec *pspec = argument->pspec; VipsArgumentInstance *argument_instance = - vips__argument_get_instance( argument_class, - object ); + vips__argument_get_instance( argument_class, object ); /* We have many props on the arg table ... filter out the * ones for this class. @@ -768,15 +767,7 @@ vips_object_dispose( GObject *gobject ) /* Our subclasses should have already called this. Run it again, just * in case. */ - if( !object->preclose ) { -#ifdef VIPS_DEBUG - printf( "vips_object_dispose: no vips_object_preclose() " ); - vips_object_print_name( VIPS_OBJECT( gobject ) ); - printf( "\n" ); -#endif /*VIPS_DEBUG*/ - - vips_object_preclose( object ); - } + vips_object_preclose( object ); /* Clear all our arguments: they may be holding resources we should * drop.