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

Revert "Revert "fix build with IM disabled""

Browse Source 
This reverts commit 4dbf2167d0.
This commit is contained in:
John Cupitt 2019-08-11 12:32:46 +01:00
parent 263f69d581
commit df9986489a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libvips/foreign/magick.c
View File

@ -48,6 +48,8 @@
#include "pforeign.h" #include "pforeign.h"
#include "magick.h" #include "magick.h"
#if defined(HAVE_MAGICK6) || defined(HAVE_MAGICK7)
/* ImageMagick can't detect some formats, like ICO, by examining the contents -- /* ImageMagick can't detect some formats, like ICO, by examining the contents --
* ico.c simply does not have a recogniser. * ico.c simply does not have a recogniser.
* *
@ -88,6 +90,8 @@ magick_sniff_file( ImageInfo *image_info, const char *filename )
magick_sniff_bytes( image_info, bytes, 256 ); magick_sniff_bytes( image_info, bytes, 256 );
} }
#endif /*defined(HAVE_MAGICK6) || defined(HAVE_MAGICK7)*/
#ifdef HAVE_MAGICK7 #ifdef HAVE_MAGICK7
Image * Image *
@ -747,4 +751,4 @@ magick_set_magick_profile( Image *image,
return( 0 ); return( 0 );
} }
#endif /*HAVE_MAGICK*/ #endif /*defined(HAVE_MAGICK6) || defined(HAVE_MAGICK7)*/