Merge branch 'master' of github.com:jcupitt/nip2

Author: jcupitt

src/imageinfo.c

@@ -470,36 +470,29 @@ static void
 imageinfo_finalize( GObject *gobject )
 {
 	Imageinfo *imageinfo = IMAGEINFO( gobject );
-	gboolean isfile = imageinfo->im ? im_isfile( imageinfo->im ) : FALSE;
-	char name[FILENAME_MAX];
+	gboolean isfile = imageinfo->im && im_isfile( imageinfo->im );
 
 #ifdef DEBUG_MAKE
 	printf( "imageinfo_finalize:" ); 
 	imageinfo_print( imageinfo );
 #endif /*DEBUG_MAKE*/
 
-	if( imageinfo->dfile && isfile ) {
-		/* We must close before we delete ... save the filename.
-		 */
-		im_strncpy( name, imageinfo->im->filename, FILENAME_MAX - 5 );
-
-#ifdef DEBUG_OPEN
-		printf( "imageinfo_destroy: unlinking \"%s\"\n", name );
-#endif /*DEBUG_OPEN*/
-	}
-
 	IM_FREEF( im_close, imageinfo->im );
 	IM_FREEF( im_close, imageinfo->mapped_im );
 	IM_FREEF( im_close, imageinfo->identity_lut );
 
 	if( imageinfo->dfile && 
-		imageinfo->delete_name &&
+		imageinfo->delete_filename &&
 		isfile ) {
-		unlinkf( "%s", imageinfo->delete_name );
+#ifdef DEBUG_OPEN
+		printf( "imageinfo_destroy: unlinking \"%s\"\n", name );
+#endif /*DEBUG_OPEN*/
+
+		unlinkf( "%s", imageinfo->delete_filename );
 		iobject_changed( IOBJECT( main_imageinfogroup ) );
 	}
 
-	VIPS_FREE( imageinfo->delete_name );
+	VIPS_FREE( imageinfo->delete_filename ); 
 
 	MANAGED_UNREF( imageinfo->underlying );
 
@@ -630,7 +623,7 @@ imageinfo_init( Imageinfo *imageinfo )
 	imageinfo->proxy = NULL;
 
 	imageinfo->dfile = FALSE;
-	imageinfo->delete_name = NULL;
+	imageinfo->delete_filename = NULL; 
 	imageinfo->from_file = FALSE;
 	imageinfo->mtime = 0;
 	imageinfo->exprs = NULL;
@@ -817,7 +810,7 @@ imageinfo_new_temp( Imageinfogroup *imageinfogroup,
 		return( NULL );
 	}
 	imageinfo->dfile = TRUE;
-	VIPS_SETSTR( imageinfo->delete_name, tname );
+	VIPS_SETSTR( imageinfo->delete_filename, tname ); 
 
 	return( imageinfo );
 }

src/imageinfo.h

@@ -121,7 +121,7 @@ struct _Imageinfo {
 	Imageinfoproxy *proxy;	/* Proxy for IMAGE callbacks */
 
 	gboolean dfile;		/* delete_file on final close */
-	char *delete_name;	/* the filename we unlink */
+	char *delete_filename;  /* and the file we delete */
 
 	gboolean from_file;	/* Set if ->name is a user file */
 	time_t mtime;		/* What mtime was when we loaded this file */