Michael Cronenworth cda0f6
--- a/configure.ac	2017-02-03 08:34:30.000000000 -0600
Michael Cronenworth cda0f6
+++ b/configure.ac	2017-08-25 17:09:15.861172295 -0500
Michael Cronenworth cda0f6
@@ -2407,7 +2407,7 @@
Michael Cronenworth cda0f6
   if test "${with_imagemagick}" != "no"; then
Michael Cronenworth cda0f6
     ## 6.3.5 is the earliest version known to work; see Bug#17339.
Michael Cronenworth cda0f6
     ## 6.8.2 makes Emacs crash; see Bug#13867.
Michael Cronenworth cda0f6
-    IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2"
Michael Cronenworth cda0f6
+    IMAGEMAGICK_MODULE="MagickWand >= 7.0"
Michael Cronenworth cda0f6
     EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
Michael Cronenworth cda0f6
     AC_SUBST(IMAGEMAGICK_CFLAGS)
Michael Cronenworth cda0f6
     AC_SUBST(IMAGEMAGICK_LIBS)
Michael Cronenworth cda0f6
--- emacs-24.3/src/image.c~	2016-12-25 12:47:48.000000000 +0100
Michael Cronenworth cda0f6
+++ emacs-24.3/src/image.c	2016-12-25 12:52:35.931084598 +0100
Michael Cronenworth cda0f6
@@ -7618,14 +7618,14 @@
Michael Cronenworth cda0f6
 /* The GIF library also defines DrawRectangle, but its never used in Emacs.
Michael Cronenworth cda0f6
    Therefore rename the function so it doesn't collide with ImageMagick.  */
Michael Cronenworth cda0f6
 #define DrawRectangle DrawRectangleGif
Michael Cronenworth cda0f6
-#include <wand/MagickWand.h>
Michael Cronenworth cda0f6
+#include <MagickWand/MagickWand.h>
Michael Cronenworth cda0f6
 
Michael Cronenworth cda0f6
 /* ImageMagick 6.5.3 through 6.6.5 hid PixelGetMagickColor for some reason.
Michael Cronenworth cda0f6
    Emacs seems to work fine with the hidden version, so unhide it.  */
Michael Cronenworth cda0f6
-#include <magick/version.h>
Michael Cronenworth cda0f6
+#include <MagickCore/version.h>
Michael Cronenworth cda0f6
 #if 0x653 <= MagickLibVersion && MagickLibVersion <= 0x665
Michael Cronenworth cda0f6
 extern WandExport void PixelGetMagickColor (const PixelWand *,
Michael Cronenworth cda0f6
-					    MagickPixelPacket *);
Michael Cronenworth cda0f6
+					    PixelInfo *);
Michael Cronenworth cda0f6
 #endif
Michael Cronenworth cda0f6
 
Michael Cronenworth cda0f6
 /* Log ImageMagick error message.
Michael Cronenworth cda0f6
@@ -8402,7 +8402,7 @@
Michael Cronenworth cda0f6
       PixelWand **source, **dest;
Michael Cronenworth cda0f6
       size_t source_width, source_height;
Michael Cronenworth cda0f6
       ssize_t source_left, source_top;
Michael Cronenworth cda0f6
-      MagickPixelPacket pixel;
Michael Cronenworth cda0f6
+      PixelInfo pixel;
Michael Cronenworth cda0f6
       DisposeType dispose;
Michael Cronenworth cda0f6
       ptrdiff_t lines = 0;
Michael Cronenworth cda0f6
 
Michael Cronenworth cda0f6
@@ -8467,7 +8467,7 @@
Michael Cronenworth cda0f6
 	      if (dispose == BackgroundDispose || PixelGetAlpha (source[x]))
Michael Cronenworth cda0f6
 		{
Michael Cronenworth cda0f6
 		  PixelGetMagickColor (source[x], &pixel);
Michael Cronenworth cda0f6
-		  PixelSetMagickColor (dest[x + source_left], &pixel);
Michael Cronenworth cda0f6
+		  PixelSetPixelColor (dest[x + source_left], &pixel);
Michael Cronenworth cda0f6
 		}
Michael Cronenworth cda0f6
 	    }
Michael Cronenworth cda0f6
 	  PixelSyncIterator (dest_iterator);
Michael Cronenworth cda0f6
@@ -8512,7 +8512,7 @@
Michael Cronenworth cda0f6
   MagickWand *image_wand;
Michael Cronenworth cda0f6
   PixelIterator *iterator;
Michael Cronenworth cda0f6
   PixelWand **pixels, *bg_wand = NULL;
Michael Cronenworth cda0f6
-  MagickPixelPacket  pixel;
Michael Cronenworth cda0f6
+  PixelInfo  pixel;
Michael Cronenworth cda0f6
   Lisp_Object image;
Michael Cronenworth cda0f6
   Lisp_Object value;
Michael Cronenworth cda0f6
   Lisp_Object crop;