[Emacs-diffs] trunk r113326: configure.ac (HAVE_IMAGEMAGICK): Check on NS also.

[Jan D.]

------------------------------------------------------------
revno: 113326
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14798
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Mon 2013-07-08 15:26:13 +0200
message:
  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*.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-07-08 06:15:38 +0000
+++ b/ChangeLog 2013-07-08 13:26:13 +0000
@@ -1,3 +1,7 @@
+2013-07-08  Magnus Henoch <address@hidden> (tiny change)
+
+       * configure.ac (HAVE_IMAGEMAGICK): Check on NS also (Bug#14798).
+
 2013-07-08  Paul Eggert  <address@hidden>
 
        Try to fix FreeBSD 9.1 porting problem (Bug#14812).

=== modified file 'configure.ac'
--- a/configure.ac      2013-07-07 23:22:43 +0000
+++ b/configure.ac      2013-07-08 13:26:13 +0000
@@ -2041,7 +2041,7 @@
 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.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-07-07 23:22:43 +0000
+++ b/src/ChangeLog     2013-07-08 13:26:13 +0000
@@ -1,3 +1,8 @@
+2013-07-08  Magnus Henoch <address@hidden> (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  <address@hidden>
 
        Port to Ubuntu 10 (Bug#14803).

=== modified file 'src/image.c'
--- a/src/image.c       2013-07-06 02:40:50 +0000
+++ b/src/image.c       2013-07-08 13:26:13 +0000
@@ -8054,7 +8054,7 @@
 
   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