aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/image.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/image.c b/src/image.c
index 7e518ce34f8..36a909ba053 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8274,15 +8274,15 @@ imagemagick_image_p (Lisp_Object object)
8274 Therefore rename the function so it doesn't collide with ImageMagick. */ 8274 Therefore rename the function so it doesn't collide with ImageMagick. */
8275#define DrawRectangle DrawRectangleGif 8275#define DrawRectangle DrawRectangleGif
8276 8276
8277#if IMAGEMAGICK_MAJOR == 6 8277#ifdef HAVE_IMAGEMAGICK7
8278# include <wand/MagickWand.h>
8279# include <magick/version.h>
8280#else
8281# include <MagickWand/MagickWand.h> 8278# include <MagickWand/MagickWand.h>
8282# include <MagickCore/version.h> 8279# include <MagickCore/version.h>
8283/* ImageMagick 7 compatibility definitions */ 8280/* ImageMagick 7 compatibility definitions. */
8284# define PixelSetMagickColor PixelSetPixelColor 8281# define PixelSetMagickColor PixelSetPixelColor
8285typedef PixelInfo MagickPixelPacket; 8282typedef PixelInfo MagickPixelPacket;
8283#else
8284# include <wand/MagickWand.h>
8285# include <magick/version.h>
8286#endif 8286#endif
8287 8287
8288/* ImageMagick 6.5.3 through 6.6.5 hid PixelGetMagickColor for some reason. 8288/* ImageMagick 6.5.3 through 6.6.5 hid PixelGetMagickColor for some reason.