configure.ac (HAVE_IMAGEMAGICK): Check on NS also.

image.c (imagemagick_load_image): Do not use MagickExportImagePixels
on NS even if it is present.  Pixmap on NS is a void*.

Fixes: debbugs:14798

diff --git a/ChangeLog b/ChangeLog
index e6e2c058b57a724c94784c3595180256168c77a5..05f87cf2733c13d6738f7f5085e165080489afbf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-08  Magnus Henoch <magnus.henoch@gmail.com> (tiny change)
+
+       * configure.ac (HAVE_IMAGEMAGICK): Check on NS also (Bug#14798).
+
 2013-07-08  Paul Eggert  <eggert@cs.ucla.edu>
 
        Try to fix FreeBSD 9.1 porting problem (Bug#14812).

diff --git a/configure.ac b/configure.ac
index 0a775efa5845dcdca64890dcc52e422210d2451e..3830ee38cc9001a5e5439bc61825c1c50630bf1c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2041,7 +2041,7 @@ if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" =
 fi
 
 HAVE_IMAGEMAGICK=no
-if test "${HAVE_X11}" = "yes"; then
+if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes"; then
   if test "${with_imagemagick}" != "no"; then
     ## 6.2.8 is the earliest version known to work, but earlier versions
     ## might work - let us know if you find one.

diff --git a/src/ChangeLog b/src/ChangeLog
index 462a246f2201aeb41d232328dc0f54305d1abfe2..9be0b59ee06e90ae6cabe7befae27c980709797d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-08  Magnus Henoch <magnus.henoch@gmail.com> (tiny change).
+
+       * image.c (imagemagick_load_image): Do not use MagickExportImagePixels
+       on NS even if it is present.  Pixmap on NS is a void*.
+
 2013-07-07  Paul Eggert  <eggert@cs.ucla.edu>
 
        Port to Ubuntu 10 (Bug#14803).

diff --git a/src/image.c b/src/image.c
index 7ecd59d27b4e62c89788ba3e51cc63356a4e010b..6ef3754e005a8e63abbe2a0be8768c6b544e4149 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -8054,7 +8054,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
 
   init_color_table ();
 
-#ifdef HAVE_MAGICKEXPORTIMAGEPIXELS
+#if defined(HAVE_MAGICKEXPORTIMAGEPIXELS) && ! defined(HAVE_NS)
   if (imagemagick_render_type != 0)
     {
       /* Magicexportimage is normally faster than pixelpushing.  This