Skip to content
Permalink
Browse files

Revert "Revert "fix build with IM disabled""

This reverts commit 4dbf216.
  • Loading branch information...
jcupitt committed Aug 11, 2019
1 parent 263f69d commit df9986489a1e62b496fd9f43eaceefd67442a89b
Showing with 5 additions and 1 deletion.
  1. +5 −1 libvips/foreign/magick.c
@@ -48,6 +48,8 @@
#include "pforeign.h"
#include "magick.h"

#if defined(HAVE_MAGICK6) || defined(HAVE_MAGICK7)

/* ImageMagick can't detect some formats, like ICO, by examining the contents --
* 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 );
}

#endif /*defined(HAVE_MAGICK6) || defined(HAVE_MAGICK7)*/

#ifdef HAVE_MAGICK7

Image *
@@ -747,4 +751,4 @@ magick_set_magick_profile( Image *image,
return( 0 );
}

#endif /*HAVE_MAGICK*/
#endif /*defined(HAVE_MAGICK6) || defined(HAVE_MAGICK7)*/

0 comments on commit df99864

Please sign in to comment.
You can’t perform that action at this time.