This commit is contained in:
John Cupitt 2008-07-15 12:12:46 +00:00
parent 09ae699930
commit d520384aeb
8 changed files with 14 additions and 14 deletions

View File

@ -375,7 +375,7 @@ im_generate( IMAGE *im,
REGION *or; REGION *or;
im_threadgroup_t *tg; im_threadgroup_t *tg;
im_image_sanity( im ); g_assert( !im_image_sanity( im ) );
if( im->Xsize <= 0 || im->Ysize <= 0 || im->Bands <= 0 ) { if( im->Xsize <= 0 || im->Ysize <= 0 || im->Bands <= 0 ) {
im_error( "im_generate", _( "bad dimensions" ) ); im_error( "im_generate", _( "bad dimensions" ) );
@ -474,7 +474,7 @@ im_prepare_thread( im_threadgroup_t *tg, REGION *or, Rect *r )
{ {
IMAGE *im = or->im; IMAGE *im = or->im;
im_image_sanity( im ); g_assert( !im_image_sanity( im ) );
switch( im->dtype ) { switch( im->dtype ) {
case IM_PARTIAL: case IM_PARTIAL:

View File

@ -147,7 +147,7 @@ convert_otom( IMAGE *im )
int int
im_incheck( IMAGE *im ) im_incheck( IMAGE *im )
{ {
im_image_sanity( im ); g_assert( !im_image_sanity( im ) );
#ifdef DEBUG_IO #ifdef DEBUG_IO
printf( "im_incheck: old-style input for %s\n", im->filename ); printf( "im_incheck: old-style input for %s\n", im->filename );

View File

@ -203,7 +203,7 @@ im_iterate( IMAGE *im,
im_threadgroup_t *tg; im_threadgroup_t *tg;
int result; int result;
im_image_sanity( im ); g_assert( !im_image_sanity( im ) );
if( !(t = im_open( "iterate", "p" )) ) if( !(t = im_open( "iterate", "p" )) )
return( -1 ); return( -1 );

View File

@ -667,9 +667,9 @@ im_image_sanity( IMAGE *im )
const char *msg; const char *msg;
if( (msg = image_sanity( im )) ) { if( (msg = image_sanity( im )) ) {
im_warn( "im_image_sanity", "\"%s\" (%p) %s", im_warn( "im_image_sanity", "%p", im );
im ? (im->filename ? im->filename : "") : "", im_warn( "im_image_sanity", "\"%s\" %s",
im, msg ); im ? (im->filename ? im->filename : "") : "", msg );
im_printdesc( im ); im_printdesc( im );
return( -1 ); return( -1 );

View File

@ -77,7 +77,7 @@
int int
im_pincheck( IMAGE *im ) im_pincheck( IMAGE *im )
{ {
im_image_sanity( im ); g_assert( !im_image_sanity( im ) );
#ifdef DEBUG_IO #ifdef DEBUG_IO
printf( "im_pincheck: enabling partial input for %s\n", im->filename ); printf( "im_pincheck: enabling partial input for %s\n", im->filename );

View File

@ -91,7 +91,7 @@
int int
im_setupout( IMAGE *im ) im_setupout( IMAGE *im )
{ {
im_image_sanity( im ); g_assert( !im_image_sanity( im ) );
if( im->Xsize <= 0 || im->Ysize <= 0 || im->Bands <= 0 ) { if( im->Xsize <= 0 || im->Ysize <= 0 || im->Bands <= 0 ) {
im_error( "im_setupout", _( "bad dimensions" ) ); im_error( "im_setupout", _( "bad dimensions" ) );

View File

@ -214,7 +214,7 @@ im_region_create( IMAGE *im )
{ {
REGION *reg; REGION *reg;
im_image_sanity( im ); g_assert( !im_image_sanity( im ) );
if( !(reg = IM_NEW( NULL, REGION )) ) if( !(reg = IM_NEW( NULL, REGION )) )
return( NULL ); return( NULL );

View File

@ -113,14 +113,14 @@ update_time( im_time_t *time, int w, int h )
int int
im__start_eval( IMAGE *im ) im__start_eval( IMAGE *im )
{ {
im_image_sanity( im ); g_assert( !im_image_sanity( im ) );
if( im->progress ) { if( im->progress ) {
#ifdef DEBUG #ifdef DEBUG
printf( "im__start_eval: %s\n", im->filename ); printf( "im__start_eval: %s\n", im->filename );
#endif /*DEBUG*/ #endif /*DEBUG*/
im_image_sanity( im->progress ); g_assert( !im_image_sanity( im->progress ) );
if( time_add( im->progress ) ) if( time_add( im->progress ) )
return( -1 ); return( -1 );
@ -158,14 +158,14 @@ im__handle_eval( IMAGE *im, int w, int h )
int int
im__end_eval( IMAGE *im ) im__end_eval( IMAGE *im )
{ {
im_image_sanity( im ); g_assert( !im_image_sanity( im ) );
if( im->progress ) { if( im->progress ) {
#ifdef DEBUG #ifdef DEBUG
printf( "im__end_eval: %s\n", im->filename ); printf( "im__end_eval: %s\n", im->filename );
#endif /*DEBUG*/ #endif /*DEBUG*/
im_image_sanity( im->progress ); g_assert( !im_image_sanity( im->progress ) );
if( im__trigger_callbacks( im->progress->evalendfns ) ) if( im__trigger_callbacks( im->progress->evalendfns ) )
return( -1 ); return( -1 );