From 4dbf2167d0387ab8dfc11be6de227aef9c7c33de Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Sun, 11 Aug 2019 12:31:39 +0100 Subject: [PATCH] Revert "fix build with IM disabled" This reverts commit 88b3aa8f2b0b9af2f692c0be51adcb7f2aa348c5. --- libvips/foreign/magick.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libvips/foreign/magick.c b/libvips/foreign/magick.c index 06bd157c..304809d7 100644 --- a/libvips/foreign/magick.c +++ b/libvips/foreign/magick.c @@ -48,8 +48,6 @@ #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. * @@ -90,8 +88,6 @@ 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 * @@ -751,4 +747,4 @@ magick_set_magick_profile( Image *image, return( 0 ); } -#endif /*defined(HAVE_MAGICK6) || defined(HAVE_MAGICK7)*/ +#endif /*HAVE_MAGICK*/