Skip to content
Permalink
Browse files

Merge branch '8.8'

  • Loading branch information
jcupitt committed Nov 26, 2019
2 parents ec41c42 + 298002c commit 49a8f0779dc3fc974bee003f14c8332fdbe986bb
Showing with 19 additions and 5 deletions.
  1. +1 −0 ChangeLog
  2. +10 −0 configure.ac
  3. +8 −5 libvips/foreign/magick.c
@@ -27,6 +27,7 @@
- support TIFF with premultiplied alpha in any band

17/9/19 started 8.8.4
- improve compatibility with older imagemagick versions

31/8/19 started 8.8.3
- revert sharpen restoring the input colourspace
@@ -721,6 +721,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
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
@@ -577,21 +577,24 @@ static MagickColorspaceTypeNames magick_colorspace_names[] = {
#ifdef HAVE_CMYCOLORSPACE
{ CMYColorspace, "CMYColorspace" },
{ HCLColorspace, "HCLColorspace" },
{ HCLpColorspace, "HCLpColorspace" },
{ HSBColorspace, "HSBColorspace" },
{ LabColorspace, "LabColorspace" },
{ LogColorspace, "LogColorspace" },
{ LuvColorspace, "LuvColorspace" },
#endif /*HAVE_CMYCOLORSPACE*/

#ifdef HAVE_HCLPCOLORSPACE
{ HCLpColorspace, "HCLpColorspace" },
{ HSIColorspace, "HSIColorspace" },
{ HSVColorspace, "HSVColorspace" },
{ LabColorspace, "LabColorspace" },
{ LCHColorspace, "LCHColorspace" },
{ LCHabColorspace, "LCHabColorspace" },
{ LCHuvColorspace, "LCHuvColorspace" },
{ LogColorspace, "LogColorspace" },
{ LMSColorspace, "LMSColorspace" },
{ LuvColorspace, "LuvColorspace" },
{ scRGBColorspace, "scRGBColorspace" },
{ xyYColorspace, "xyYColorspace" },
{ YDbDrColorspace, "YDbDrColorspace" },
#endif /*HAVE_CMYCOLORSPACE*/
#endif /*HAVE_HCLPCOLORSPACE*/

/* im7 has this, I think
*

0 comments on commit 49a8f07

Please sign in to comment.
You can’t perform that action at this time.