diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | dmagick/c/cache.d | 3 | ||||
| -rw-r--r-- | dmagick/c/magickVersion.d | 9 | ||||
| -rw-r--r-- | dmagick/c/option.d | 9 | ||||
| -rw-r--r-- | dmagick/c/pixel.d | 6 | ||||
| -rw-r--r-- | dmagick/c/transform.d | 5 |
6 files changed, 30 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile index b98cd9b..d95bbf6 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -49,7 +49,7 @@ ifneq ("$(QUANTUMDEPTH)","Q16") VERSIONS+= -version=$(subst Q,Quantum,$(QUANTUMDEPTH)) endif -ifneq ("$(MAGICKVERSION)","681") +ifneq ("$(MAGICKVERSION)","682") VERSIONS+= -version=MagickCore_$(MAGICKVERSION) endif diff --git a/dmagick/c/cache.d b/dmagick/c/cache.d index f97e7cf..4418a93 100644 --- a/dmagick/c/cache.d +++ b/dmagick/c/cache.d @@ -17,7 +17,8 @@ extern(C) MemoryCache, MapCache, DiskCache, - PingCache + PingCache, + DistributedCache } static if ( MagickLibVersion >= 0x677 ) diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d index 7e629d3..6ee9e1c 100644 --- a/dmagick/c/magickVersion.d +++ b/dmagick/c/magickVersion.d @@ -152,13 +152,20 @@ extern(C) ///ditto enum MagickLibVersionText = "6.8.0"; } - else + else version(MagickCore_681) { /// Defines the version of ImageMagick where these headers are based on. enum MagickLibVersion = 0x681; ///ditto enum MagickLibVersionText = "6.8.1"; } + else + { + /// Defines the version of ImageMagick where these headers are based on. + enum MagickLibVersion = 0x682; + ///ditto + enum MagickLibVersionText = "6.8.2"; + } /* * With ImageMagick 6.6.3 long and unsinged long were changed to diff --git a/dmagick/c/option.d b/dmagick/c/option.d index 06e6bf6..ea85668 100644 --- a/dmagick/c/option.d +++ b/dmagick/c/option.d @@ -27,7 +27,14 @@ extern(C) MagickUndefinedOptions = -1, MagickAlignOptions = 0, MagickAlphaOptions, - MagickBooleanOptions, + MagickBooleanOptions,"; + + static if ( MagickLibVersion >= 0x682 ) + { + options ~= "MagickCacheOptions,"; + } + + options ~= " MagickChannelOptions, MagickClassOptions, MagickClipPathOptions, diff --git a/dmagick/c/pixel.d b/dmagick/c/pixel.d index 424fe5e..729d7c3 100644 --- a/dmagick/c/pixel.d +++ b/dmagick/c/pixel.d @@ -156,5 +156,11 @@ extern(C) MagickPixelPacket* CloneMagickPixelPacket(const(MagickPixelPacket)*); } + static if ( MagickLibVersion >= 0x682 ) + { + MagickRealType DecodePixelGamma(const MagickRealType); + MagickRealType EncodePixelGamma(const MagickRealType); + } + void GetMagickPixelPacket(const(Image)*, MagickPixelPacket*); } diff --git a/dmagick/c/transform.d b/dmagick/c/transform.d index df325d4..27b79ca 100644 --- a/dmagick/c/transform.d +++ b/dmagick/c/transform.d @@ -10,6 +10,11 @@ alias ptrdiff_t ssize_t; extern(C) { + static if ( MagickLibVersion >= 0x682 ) + { + Image* AutoOrientImage(const(Image)*, const OrientationType, ExceptionInfo*); + } + Image* ChopImage(const(Image)*, const(RectangleInfo)*, ExceptionInfo*); Image* ConsolidateCMYKImages(const(Image)*, ExceptionInfo*); Image* CropImage(const(Image)*, const(RectangleInfo)*, ExceptionInfo*); |