1 --- emacs-25.1/configure.ac~ 2016-07-25 09:08:36.000000000 +0200
2 +++ emacs-25.1/configure.ac 2016-12-25 13:00:06.594562908 +0100
3 @@ -2524,7 +2524,7 @@ if test "${HAVE_X11}" = "yes" || test "$
4 ## 6.3.5 is the earliest version known to work; see Bug#17339.
5 ## 6.8.2 makes Emacs crash; see Bug#13867.
6 ## 7 and later have not been ported to; See Bug#25967.
7 - IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2 Wand < 7"
8 + IMAGEMAGICK_MODULE="MagicWand >= 6.3.5 Wand != 6.8.2"
9 EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
11 if test $HAVE_IMAGEMAGICK = yes; then
12 --- emacs-24.3/src/image.c~ 2016-12-25 12:47:48.000000000 +0100
13 +++ emacs-24.3/src/image.c 2016-12-25 12:52:35.931084598 +0100
14 @@ -7618,14 +7618,14 @@
15 /* The GIF library also defines DrawRectangle, but its never used in Emacs.
16 Therefore rename the function so it doesn't collide with ImageMagick. */
17 #define DrawRectangle DrawRectangleGif
18 -#include <wand/MagickWand.h>
19 +#include <MagickWand/MagickWand.h>
21 /* ImageMagick 6.5.3 through 6.6.5 hid PixelGetMagickColor for some reason.
22 Emacs seems to work fine with the hidden version, so unhide it. */
23 -#include <magick/version.h>
24 +#include <MagickCore/version.h>
25 #if 0x653 <= MagickLibVersion && MagickLibVersion <= 0x665
26 extern WandExport void PixelGetMagickColor (const PixelWand *,
27 - MagickPixelPacket *);
31 /* Log ImageMagick error message.
33 PixelWand **source, **dest;
34 size_t source_width, source_height;
35 ssize_t source_left, source_top;
36 - MagickPixelPacket pixel;
42 if (dispose == BackgroundDispose || PixelGetAlpha (source[x]))
44 PixelGetMagickColor (source[x], &pixel);
45 - PixelSetMagickColor (dest[x + source_left], &pixel);
46 + PixelSetPixelColor (dest[x + source_left], &pixel);
49 PixelSyncIterator (dest_iterator);
51 MagickWand *image_wand;
52 PixelIterator *iterator;
53 PixelWand **pixels, *bg_wand = NULL;
54 - MagickPixelPacket pixel;