From e4b1e5afb4793638ca103cc1ba70c83a8a756e54 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 8 Jul 2013 15:26:13 +0200 Subject: [PATCH] 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 --- ChangeLog | 4 ++++ configure.ac | 2 +- src/ChangeLog | 5 +++++ src/image.c | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6e2c058b57..05f87cf2733 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-07-08 Magnus Henoch (tiny change) + + * configure.ac (HAVE_IMAGEMAGICK): Check on NS also (Bug#14798). + 2013-07-08 Paul Eggert Try to fix FreeBSD 9.1 porting problem (Bug#14812). diff --git a/configure.ac b/configure.ac index 0a775efa584..3830ee38cc9 100644 --- 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 462a246f220..9be0b59ee06 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-07-08 Magnus Henoch (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 Port to Ubuntu 10 (Bug#14803). 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 -- 2.39.2