procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Jan Djärv 2013-07-08 15:26:13 +02:00
parent 6388fe5e47
commit e4b1e5afb4
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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).

2
configure.ac
View file

@ -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.

5
src/ChangeLog
View file

@ -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).

2
src/image.c
View file

@ -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