gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

wrlib: changed the function used to detecting MagickWand

Browse Source 
It looks like that the function 'MagickGetImagePixels' is part of
the "deprecate.h" header, at least in ImageMagick 6.8.8. As it is not
used in WRaster's code, it is safer to actually check for 'NewMagickWand'
that is being used and which is not yet deprecated.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2014-05-08 20:16:02 +02:00
committed by Carlos R. Mafra
parent 698cffacc5
commit 8e0ec489a8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
m4/wm_imgfmt_check.m4
View File

@@ -275,7 +275,7 @@ AS_IF([test "x$enable_magick" = "xno"],
wm_save_LIBS="$LIBS" wm_save_LIBS="$LIBS"
dnl dnl
dnl We check that the library is available dnl We check that the library is available
AS_IF([wm_fn_lib_try_link "MagickGetImagePixels" "$wm_cv_libchk_magick_libs"], AS_IF([wm_fn_lib_try_link "NewMagickWand" "$wm_cv_libchk_magick_libs"],
[wm_cv_libchk_magick=maybe]) [wm_cv_libchk_magick=maybe])
LIBS="$wm_save_LIBS" LIBS="$wm_save_LIBS"
AS_IF([test "x$enable_magick$wm_cv_libchk_magick" = "xyesno"], AS_IF([test "x$enable_magick$wm_cv_libchk_magick" = "xyesno"],
@@ -284,7 +284,7 @@ AS_IF([test "x$enable_magick" = "xno"],
dnl The library was found, check if header is available and compiles dnl The library was found, check if header is available and compiles
AS_IF([test "x$wm_cv_libchk_magick" != "xno"], AS_IF([test "x$wm_cv_libchk_magick" != "xno"],
[wm_save_CFLAGS="$CFLAGS" [wm_save_CFLAGS="$CFLAGS"
AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "" "return 0" "$wm_cv_libchk_magick_cflags"], AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
[wm_cv_libchk_magick="$wm_cv_libchk_magick_cflags % $wm_cv_libchk_magick_libs"], [wm_cv_libchk_magick="$wm_cv_libchk_magick_cflags % $wm_cv_libchk_magick_libs"],
[AC_MSG_ERROR([found Magick library but could not compile appropriate header - are you missing libmagickwand-dev package?])]) [AC_MSG_ERROR([found Magick library but could not compile appropriate header - are you missing libmagickwand-dev package?])])
CFLAGS="$wm_save_CFLAGS"]) CFLAGS="$wm_save_CFLAGS"])