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

tiny fixes

Browse Source
This commit is contained in:
John Cupitt 2012-11-21 10:00:57 +00:00
parent b3a6596732
commit 047d78261a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libvips/foreign/magick2vips.c
View File

@ -231,11 +231,11 @@ parse_header( Read *read )
#ifdef DEBUG #ifdef DEBUG
printf( "parse_header: filename = %s\n", read->filename ); printf( "parse_header: filename = %s\n", read->filename );
printf( "GetImageChannelDepth(AllChannels) = %d\n", printf( "GetImageChannelDepth(AllChannels) = %zd\n",
GetImageChannelDepth( image, AllChannels, &image->exception ) ); GetImageChannelDepth( image, AllChannels, &image->exception ) );
printf( "GetImageDepth() = %ld\n", printf( "GetImageDepth() = %zd\n",
GetImageDepth( image, &image->exception ) ); GetImageDepth( image, &image->exception ) );
printf( "image->depth = %u\n", image->depth ); printf( "image->depth = %zd\n", image->depth );
printf( "GetImageType() = %d\n", printf( "GetImageType() = %d\n",
GetImageType( image, &image->exception ) ); GetImageType( image, &image->exception ) );
printf( "IsGrayImage() = %d\n", printf( "IsGrayImage() = %d\n",
@ -653,6 +653,10 @@ vips__magick_read( const char *filename, VipsImage *out )
SetImageOption( read->image_info, "dcm:display-range", "reset" ); SetImageOption( read->image_info, "dcm:display-range", "reset" );
#endif /*HAVE_SETIMAGEOPTION*/ #endif /*HAVE_SETIMAGEOPTION*/
#ifdef DEBUG
printf( "magick2vips: calling ReadImage() ...\n" );
#endif /*DEBUG*/
read->image = ReadImage( read->image_info, &read->exception ); read->image = ReadImage( read->image_info, &read->exception );
if( !read->image ) { if( !read->image ) {
vips_error( "magick2vips", _( "unable to read file \"%s\"\n" vips_error( "magick2vips", _( "unable to read file \"%s\"\n"
@ -681,12 +685,16 @@ vips__magick_read_header( const char *filename, VipsImage *im )
Read *read; Read *read;
#ifdef DEBUG #ifdef DEBUG
printf( "magick2vips: vips__magick_read_header: %s\n", filename ); printf( "vips__magick_read_header: %s\n", filename );
#endif /*DEBUG*/ #endif /*DEBUG*/
if( !(read = read_new( filename, im )) ) if( !(read = read_new( filename, im )) )
return( -1 ); return( -1 );
#ifdef DEBUG
printf( "vips__magick_read_header: pinging image ...\n" );
#endif /*DEBUG*/
read->image = PingImage( read->image_info, &read->exception ); read->image = PingImage( read->image_info, &read->exception );
if( !read->image ) { if( !read->image ) {
vips_error( "magick2vips", _( "unable to ping file " vips_error( "magick2vips", _( "unable to ping file "