Merge branch 'master' of github.com:jcupitt/libvips
This commit is contained in:
commit
7e9efd7a3e
|
@ -184,22 +184,14 @@ read_new( const char *filename, VipsImage *im,
|
||||||
const char *format, const char *density, int page, int n )
|
const char *format, const char *density, int page, int n )
|
||||||
{
|
{
|
||||||
Read *read;
|
Read *read;
|
||||||
static int inited = 0;
|
|
||||||
|
|
||||||
if( !inited ) {
|
magick_genesis();
|
||||||
#ifdef HAVE_MAGICKCOREGENESIS
|
|
||||||
MagickCoreGenesis( vips_get_argv0(), MagickFalse );
|
|
||||||
#else /*!HAVE_MAGICKCOREGENESIS*/
|
|
||||||
InitializeMagick( "" );
|
|
||||||
#endif /*HAVE_MAGICKCOREGENESIS*/
|
|
||||||
inited = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* IM doesn't use the -1 means end-of-file convention, change it to a
|
/* IM doesn't use the -1 means end-of-file convention, change it to a
|
||||||
* very large number.
|
* very large number.
|
||||||
*/
|
*/
|
||||||
if( n == -1 )
|
if( n == -1 )
|
||||||
n = 100000;
|
n = 10000000;
|
||||||
|
|
||||||
if( !(read = VIPS_NEW( im, Read )) )
|
if( !(read = VIPS_NEW( im, Read )) )
|
||||||
return( NULL );
|
return( NULL );
|
||||||
|
@ -784,10 +776,9 @@ vips__magick_read( const char *filename,
|
||||||
|
|
||||||
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"
|
magick_vips_error( "magick2vips", &read->exception );
|
||||||
"libMagick error: %s %s" ),
|
vips_error( "magick2vips",
|
||||||
filename,
|
_( "unable to read file \"%s\"" ), filename );
|
||||||
read->exception.reason, read->exception.description );
|
|
||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -824,10 +815,9 @@ vips__magick_read_header( const char *filename,
|
||||||
|
|
||||||
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 "
|
magick_vips_error( "magick2vips", &read->exception );
|
||||||
"\"%s\"\nlibMagick error: %s %s" ),
|
vips_error( "magick2vips",
|
||||||
filename,
|
_( "unable to ping file \"%s\"" ), filename );
|
||||||
read->exception.reason, read->exception.description );
|
|
||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -868,9 +858,8 @@ vips__magick_read_buffer( const void *buf, const size_t len,
|
||||||
read->image = BlobToImage( read->image_info,
|
read->image = BlobToImage( read->image_info,
|
||||||
buf, len, &read->exception );
|
buf, len, &read->exception );
|
||||||
if( !read->image ) {
|
if( !read->image ) {
|
||||||
vips_error( "magick2vips", _( "unable to read buffer\n"
|
magick_vips_error( "magick2vips", &read->exception );
|
||||||
"libMagick error: %s %s" ),
|
vips_error( "magick2vips", "%s", _( "unable to read buffer" ) );
|
||||||
read->exception.reason, read->exception.description );
|
|
||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -903,9 +892,8 @@ vips__magick_read_buffer_header( const void *buf, const size_t len,
|
||||||
|
|
||||||
read->image = PingBlob( read->image_info, buf, len, &read->exception );
|
read->image = PingBlob( read->image_info, buf, len, &read->exception );
|
||||||
if( !read->image ) {
|
if( !read->image ) {
|
||||||
vips_error( "magick2vips", _( "unable to ping blob\n"
|
magick_vips_error( "magick2vips", &read->exception );
|
||||||
"libMagick error: %s %s" ),
|
vips_error( "magick2vips", "%s", _( "unable to ping blob" ) );
|
||||||
read->exception.reason, read->exception.description );
|
|
||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue