fix build with imagemagick 6.7.8.9

Ships with centos7, so an important version to support.

See https://github.com/libvips/libvips/issues/1479
This commit is contained in:
John Cupitt 2019-11-25 15:44:28 +00:00
parent c9a7b92eeb
commit 298002c530
3 changed files with 19 additions and 5 deletions

View File

@ -1,4 +1,5 @@
17/9/19 started 8.8.4 17/9/19 started 8.8.4
- improve compatibility with older imagemagick versions
31/8/19 started 8.8.3 31/8/19 started 8.8.3
- revert sharpen restoring the input colourspace - revert sharpen restoring the input colourspace

View File

@ -698,6 +698,16 @@ if test x"$magick6" = x"yes"; then
] ]
) )
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[#include <magick/api.h>],
[ColorspaceType colorspace = HCLpColorspace]
)],
[AC_DEFINE(HAVE_HCLPCOLORSPACE,1,
[define if your Magick has HCLpColorspace.])
]
)
# GetImageMagick() takes two args under GM, three under IM # GetImageMagick() takes two args under GM, three under IM
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM( [AC_LANG_PROGRAM(

View File

@ -515,21 +515,24 @@ static MagickColorspaceTypeNames magick_colorspace_names[] = {
#ifdef HAVE_CMYCOLORSPACE #ifdef HAVE_CMYCOLORSPACE
{ CMYColorspace, "CMYColorspace" }, { CMYColorspace, "CMYColorspace" },
{ HCLColorspace, "HCLColorspace" }, { HCLColorspace, "HCLColorspace" },
{ HCLpColorspace, "HCLpColorspace" },
{ HSBColorspace, "HSBColorspace" }, { HSBColorspace, "HSBColorspace" },
{ LabColorspace, "LabColorspace" },
{ LogColorspace, "LogColorspace" },
{ LuvColorspace, "LuvColorspace" },
#endif /*HAVE_CMYCOLORSPACE*/
#ifdef HAVE_HCLPCOLORSPACE
{ HCLpColorspace, "HCLpColorspace" },
{ HSIColorspace, "HSIColorspace" }, { HSIColorspace, "HSIColorspace" },
{ HSVColorspace, "HSVColorspace" }, { HSVColorspace, "HSVColorspace" },
{ LabColorspace, "LabColorspace" },
{ LCHColorspace, "LCHColorspace" }, { LCHColorspace, "LCHColorspace" },
{ LCHabColorspace, "LCHabColorspace" }, { LCHabColorspace, "LCHabColorspace" },
{ LCHuvColorspace, "LCHuvColorspace" }, { LCHuvColorspace, "LCHuvColorspace" },
{ LogColorspace, "LogColorspace" },
{ LMSColorspace, "LMSColorspace" }, { LMSColorspace, "LMSColorspace" },
{ LuvColorspace, "LuvColorspace" },
{ scRGBColorspace, "scRGBColorspace" }, { scRGBColorspace, "scRGBColorspace" },
{ xyYColorspace, "xyYColorspace" }, { xyYColorspace, "xyYColorspace" },
{ YDbDrColorspace, "YDbDrColorspace" }, { YDbDrColorspace, "YDbDrColorspace" },
#endif /*HAVE_CMYCOLORSPACE*/ #endif /*HAVE_HCLPCOLORSPACE*/
/* im7 has this, I think /* im7 has this, I think
* *