[packages/emacs] - working ImageMagick 7 fix

[baggins]

commit f683f3f61a090f277f37b4097caa2a321a5a64dd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Dec 25 18:35:36 2016 +0100

    - working ImageMagick 7 fix

 imagemagick7.patch | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/imagemagick7.patch b/imagemagick7.patch
index 3058401..199219b 100644
--- a/imagemagick7.patch
+++ b/imagemagick7.patch
@@ -11,7 +11,7 @@
      AC_SUBST(IMAGEMAGICK_LIBS)
 --- emacs-24.3/src/image.c~	2016-12-25 12:47:48.000000000 +0100
 +++ emacs-24.3/src/image.c	2016-12-25 12:52:35.931084598 +0100
-@@ -7618,11 +7618,11 @@
+@@ -7618,14 +7618,14 @@
  /* The GIF library also defines DrawRectangle, but its never used in Emacs.
     Therefore rename the function so it doesn't collide with ImageMagick.  */
  #define DrawRectangle DrawRectangleGif
@@ -24,4 +24,35 @@
 +#include <MagickCore/version.h>
  #if 0x653 <= MagickLibVersion && MagickLibVersion <= 0x665
  extern WandExport void PixelGetMagickColor (const PixelWand *,
- 					    MagickPixelPacket *);
+-					    MagickPixelPacket *);
++					    PixelInfo *);
+ #endif
+ 
+ /* Log ImageMagick error message.
+@@ -8402,7 +8402,7 @@
+       PixelWand **source, **dest;
+       size_t source_width, source_height;
+       ssize_t source_left, source_top;
+-      MagickPixelPacket pixel;
++      PixelInfo pixel;
+       DisposeType dispose;
+       ptrdiff_t lines = 0;
+ 
+@@ -8467,7 +8467,7 @@
+ 	      if (dispose == BackgroundDispose || PixelGetAlpha (source[x]))
+ 		{
+ 		  PixelGetMagickColor (source[x], &pixel);
+-		  PixelSetMagickColor (dest[x + source_left], &pixel);
++		  PixelSetPixelColor (dest[x + source_left], &pixel);
+ 		}
+ 	    }
+ 	  PixelSyncIterator (dest_iterator);
+@@ -8512,7 +8512,7 @@
+   MagickWand *image_wand;
+   PixelIterator *iterator;
+   PixelWand **pixels, *bg_wand = NULL;
+-  MagickPixelPacket  pixel;
++  PixelInfo  pixel;
+   Lisp_Object image;
+   Lisp_Object value;
+   Lisp_Object crop;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/emacs.git/commitdiff/3044f8ada830453a66ef47b049d4a5088e575a0f