From e4b1e5afb4793638ca103cc1ba70c83a8a756e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= <jan.h.d@swipnet.se>
Date: Mon, 8 Jul 2013 15:26:13 +0200
Subject: 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
---
 src/image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/image.c')

diff --git a/src/image.c b/src/image.c
index 7ecd59d27b4..6ef3754e005 100644
--- 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
-- 
cgit v1.2.1