diff options
author | Chong Yidong <cyd@gnu.org> | 2012-06-12 18:08:39 +0800 |
---|---|---|
committer | Chong Yidong <cyd@gnu.org> | 2012-06-12 18:08:39 +0800 |
commit | 0e25d3345f2ae31fc987fbf0515c29ea043ac526 (patch) | |
tree | 6fc3c71245bc227d2371195a746e35604f8966cf /configure.in | |
parent | 47fc1d6ba8179861744412a9322378654a9c30d8 (diff) | |
download | emacs-0e25d3345f2ae31fc987fbf0515c29ea043ac526.tar.gz emacs-0e25d3345f2ae31fc987fbf0515c29ea043ac526.tar.bz2 emacs-0e25d3345f2ae31fc987fbf0515c29ea043ac526.zip |
Handle availability of MagickMergeImageLayers and MagickExportImagePixels
* configure.in: Check for MagickMergeImageLayers.
* src/image.c (imagemagick_load_image): Use MagickFlattenImage if
MagickMergeImageLayers is undefined. Use pixel pusher loop if
MagickExportImagePixels is undefined.
Fixes: debbugs:11678
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 48644658586..f11b6651c1d 100644 --- a/configure.in +++ b/configure.in @@ -1855,6 +1855,7 @@ if test "${HAVE_X11}" = "yes"; then CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" LIBS="$IMAGEMAGICK_LIBS $LIBS" AC_CHECK_FUNCS(MagickExportImagePixels) + AC_CHECK_FUNCS(MagickMergeImageLayers) fi fi fi |