File emacs-25.2-ImageMagick7.patch of Package emacs.15548

Overview Repositories Revisions Requests Users Attributes Meta

File emacs-25.2-ImageMagick7.patch of Package emacs.15548

Index: emacs-25.2/configure.ac
===================================================================
---
 emacs-25.3/configure.ac |    2 +-
 emacs-25.3/src/image.c  |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

--- emacs-25.3/configure.ac
+++ emacs-25.3/configure.ac	2017-09-22 09:59:44.049203440 +0000
@@ -2408,7 +2408,7 @@ if test "${HAVE_X11}" = "yes" || test "$
   if test "${with_imagemagick}" != "no"; then
     ## 6.3.5 is the earliest version known to work; see Bug#17339.
     ## 6.8.2 makes Emacs crash; see Bug#13867.
-    IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2"
+    IMAGEMAGICK_MODULE="MagickWand >= 6.3.5 MagickWand != 6.8.2"
     EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
     AC_SUBST(IMAGEMAGICK_CFLAGS)
     AC_SUBST(IMAGEMAGICK_LIBS)
--- emacs-25.3/src/image.c
+++ emacs-25.3/src/image.c	2017-09-22 09:59:44.053203364 +0000
@@ -8402,7 +8402,11 @@ imagemagick_compute_animated_image (Magi
       PixelWand **source, **dest;
       size_t source_width, source_height;
       ssize_t source_left, source_top;
+#if MagickLibVersion >= 0x700
+      PixelInfo pixel;  
+#else
       MagickPixelPacket pixel;
+#endif
       DisposeType dispose;
       ptrdiff_t lines = 0;
 
@@ -8467,7 +8471,11 @@ imagemagick_compute_animated_image (Magi
 	      if (dispose == BackgroundDispose || PixelGetAlpha (source[x]))
 		{
 		  PixelGetMagickColor (source[x], &pixel);
+#if MagickLibVersion >= 0x700
+		  PixelSetPixelColor (dest[x + source_left], &pixel);
+#else
 		  PixelSetMagickColor (dest[x + source_left], &pixel);
+#endif
 		}
 	    }
 	  PixelSyncIterator (dest_iterator);
@@ -8512,7 +8520,11 @@ imagemagick_load_image (struct frame *f,
   MagickWand *image_wand;
   PixelIterator *iterator;
   PixelWand **pixels, *bg_wand = NULL;
+#if MagickLibVersion >= 0x700
+  PixelInfo pixel;
+#else
   MagickPixelPacket  pixel;
+#endif
   Lisp_Object image;
   Lisp_Object value;
   Lisp_Object crop;

Places

File emacs-25.2-ImageMagick7.patch of Package emacs.15548

Places