sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stuff

Browse Source
This commit is contained in:
John Cupitt 2008-07-07 07:31:08 +00:00
parent 7c649f7af1
commit 8f3f0a8ef6
3 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
libsrc/iofuncs/im_close.c
View File

@ -260,53 +260,44 @@ im_close( IMAGE *im )
if( !im ) if( !im )
return( result ); return( result );
/* Are there any regions left on this image? If there are, just set
* close_pending and return. The image will be then be closed when
* the last region is freed (see im_region_free()). This prevents
* some dangling region pointers.
*/
#ifdef DEBUG_IO
if( im->close_pending )
/* Strange! Just print a warning.
*/
printf( "im_close: im_close called twice on \"%s\"\n",
im->filename );
#endif /*DEBUG_IO*/
if( im->regions ) { if( im->regions ) {
/* There are regions left on this image.
* Set close_pending and return. The image will be then
* be closed when the last region is freed
* (see im_region_free()).
*/
#ifdef DEBUG_IO #ifdef DEBUG_IO
printf( "im_close: pending close for \"%s\"\n", im->filename ); printf( "im_close: pending close for \"%s\"\n", im->filename );
#endif /*DEBUG_IO*/ #endif /*DEBUG_IO*/
im->close_pending = 1; im->close_pending = 1;
return( result );
} }
else if( !im->closing )
/* Is this descriptor currently being closed somewhere else?
* This prevents infinite descent if a close callback
* includes an im_close for this image.
*/
im->closing = 1;
/* Is this descriptor currently being closed somewhere else? Immediate if( im__close( im ) )
* return if it is. This prevents infinite descent if a close callback result = -1;
* includes an im_close for this image. This can happen sometimes!
*/
if( im->closing )
return( result );
im->closing = 1;
/* Free IMAGE resources.
*/
if( im__close( im ) )
result = -1;
#ifdef DEBUG_NEW #ifdef DEBUG_NEW
printf( "im_close: freeing IMAGE 0x%p, \"%s\"\n", im, im->filename ); printf( "im_close: freeing IMAGE 0x%p, \"%s\"\n",
im, im->filename );
#endif /*DEBUG_NEW*/ #endif /*DEBUG_NEW*/
/* Final cleanup. /* Final cleanup.
*/ */
IM_FREEF( g_mutex_free, im->sslock ); IM_FREEF( g_mutex_free, im->sslock );
IM_FREE( im->filename ); IM_FREE( im->filename );
IM_FREE( im->Hist ); IM_FREE( im->Hist );
IM_FREEF( im__gslist_gvalue_free, im->history_list ); IM_FREEF( im__gslist_gvalue_free, im->history_list );
im__meta_destroy( im ); im__meta_destroy( im );
im__open_images = g_slist_remove( im__open_images, im ); im__open_images = g_slist_remove( im__open_images, im );
im__time_destroy( im ); im__time_destroy( im );
IM_FREE( im ); IM_FREE( im );
}
return( result ); return( result );
} }

1
libsrc/iofuncs/im_init.c
View File

@ -163,6 +163,7 @@ im_init( const char *filename )
im->evalstartfns = NULL; im->evalstartfns = NULL;
im->preclosefns = NULL; im->preclosefns = NULL;
im->invalidatefns = NULL;
if( !(im->filename = im_strdup( NULL, filename )) ) { if( !(im->filename = im_strdup( NULL, filename )) ) {
im_close( im ); im_close( im );

14
libsrc/iofuncs/im_printdesc.c
View File

@ -317,17 +317,19 @@ im_printdesc( IMAGE *image )
/* Print other (non-header) fields. /* Print other (non-header) fields.
*/ */
if( image->generate ) if( image->generate )
printf( "user generate function attached\n" ); printf( "generate function attached\n" );
if( image->closefns ) if( image->closefns )
printf( "user close callbacks attached\n" ); printf( "close callbacks attached\n" );
if( image->evalfns ) if( image->evalfns )
printf( "user eval callbacks attached\n" ); printf( "eval callbacks attached\n" );
if( image->evalendfns ) if( image->evalendfns )
printf( "user evalend callbacks attached\n" ); printf( "evalend callbacks attached\n" );
if( image->evalstartfns ) if( image->evalstartfns )
printf( "user evalstart callbacks attached\n" ); printf( "evalstart callbacks attached\n" );
if( image->preclosefns ) if( image->preclosefns )
printf( "user preclose callbacks attached\n" ); printf( "preclose callbacks attached\n" );
if( image->invalidatefns )
printf( "invalidate callbacks attached\n" );
if( image->regions ) { if( image->regions ) {
printf( "%d regions present\n", printf( "%d regions present\n",
g_slist_length( image->regions ) ); g_slist_length( image->regions ) );