diff options
| -rw-r--r-- | dmagick/c/accelerate.d | 9 | ||||
| -rw-r--r-- | dmagick/c/deprecate.d | 6 | ||||
| -rw-r--r-- | dmagick/c/fx.d | 5 | ||||
| -rw-r--r-- | dmagick/c/magickString.d | 6 | ||||
| -rw-r--r-- | dmagick/c/magickType.d | 6 | ||||
| -rw-r--r-- | dmagick/c/magickVersion.d | 10 | ||||
| -rw-r--r-- | dmagick/c/policy.d | 3 | ||||
| -rw-r--r-- | dmagick/c/token.d | 10 |
8 files changed, 51 insertions, 4 deletions
diff --git a/dmagick/c/accelerate.d b/dmagick/c/accelerate.d index 22b108b..ef36c12 100644 --- a/dmagick/c/accelerate.d +++ b/dmagick/c/accelerate.d @@ -19,6 +19,10 @@ extern(C) MagickBooleanType AccelerateCompositeImage(Image*, const ChannelType, const CompositeOperator, const(Image)*, const ssize_t, const ssize_t, const float, const float, ExceptionInfo*); MagickBooleanType AccelerateContrastStretchImageChannel(Image*, const ChannelType, const double, const double, ExceptionInfo*); MagickBooleanType AccelerateGrayscaleImage(Image*, const PixelIntensityMethod, ExceptionInfo*); + } + + static if ( MagickLibVersion >= 0x689 && MagickLibVersion < 0x694 ) + { MagickBooleanType AccelerateRandomImage(Image*, ExceptionInfo*); } @@ -45,6 +49,11 @@ extern(C) Image* AccelerateUnsharpMaskImage(const(Image)*, const ChannelType, const double, const double, const double, const double, ExceptionInfo*); } + static if ( MagickLibVersion >= 0x694 ) + { + Image* AccelerateWaveletDenoiseImage(const(Image)*, const double, ExceptionInfo*); + } + static if ( MagickLibVersion >= 0x693 ) { Image* AccelerateLocalContrastImage(const(Image)*, const double, const double, ExceptionInfo*); diff --git a/dmagick/c/deprecate.d b/dmagick/c/deprecate.d index b96499a..1a55ee5 100644 --- a/dmagick/c/deprecate.d +++ b/dmagick/c/deprecate.d @@ -289,6 +289,12 @@ deprecated extern(C) } void* GetMagickRegistry(const ssize_t, RegistryType*, size_t*, ExceptionInfo*); + + static if ( MagickLibVersion >= 0x694 ) + { + void GetTokenToken(const(char)*, const(char)**, char*); + } + void IdentityAffine(AffineMatrix*); void LiberateMemory(void**); void LiberateSemaphoreInfo(SemaphoreInfo**); diff --git a/dmagick/c/fx.d b/dmagick/c/fx.d index 08292eb..cf8706b 100644 --- a/dmagick/c/fx.d +++ b/dmagick/c/fx.d @@ -60,6 +60,11 @@ extern(C) Image* VignetteImage(const(Image)*, const double, const double, const ssize_t, const ssize_t, ExceptionInfo*); Image* WaveImage(const(Image)*, const double, const double, ExceptionInfo*); + static if ( MagickLibVersion >= 0x694 ) + { + Image* WaveletDenoiseImage(const(Image)*, const double, const double, ExceptionInfo*); + } + MagickBooleanType PlasmaImage(Image*, const(SegmentInfo)*, size_t, size_t); MagickBooleanType SolarizeImage(Image*, const double); diff --git a/dmagick/c/magickString.d b/dmagick/c/magickString.d index d82ab55..8a718e6 100644 --- a/dmagick/c/magickString.d +++ b/dmagick/c/magickString.d @@ -33,6 +33,12 @@ extern(C) char* EscapeString(const(char)*, const char); char* FileToString(const(char)*, const size_t, ExceptionInfo*); char* GetEnvironmentValue(const(char)*); + + static if ( MagickLibVersion >= 0x694 ) + { + char* SanitizeString(const(char)*); + } + char* StringInfoToHexString(const(StringInfo)*); char* StringInfoToString(const(StringInfo)*); char** StringToArgv(const(char)*, int*); diff --git a/dmagick/c/magickType.d b/dmagick/c/magickType.d index 0fc0264..49d7889 100644 --- a/dmagick/c/magickType.d +++ b/dmagick/c/magickType.d @@ -177,10 +177,14 @@ extern (C) enum MagickRealType MagickEpsilon = 1.0e-15; enum MagickRealType MagickHuge = 3.4e+38; } - else static if ( MagickLibVersion >= 0x689 ) + else static if ( MagickLibVersion >= 0x689 && MagickLibVersion < 0x694 ) { enum MagickRealType MagickEpsilon = 1.0e-15; } + else static if ( MagickLibVersion >= 0x694 ) + { + enum MagickRealType MagickEpsilon = 1.0e-14; + } alias uint MagickStatusType; alias long MagickOffsetType; diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d index 55a3e7e..383aee7 100644 --- a/dmagick/c/magickVersion.d +++ b/dmagick/c/magickVersion.d @@ -236,13 +236,21 @@ extern(C) ///ditto enum MagickLibVersionText = "6.9.2"; } - else + else version(MagickCore_693) { /// Defines the version of ImageMagick where these headers are based on. enum MagickLibVersion = 0x693; ///ditto enum MagickLibVersionText = "6.9.3"; } + else + { + /// Defines the version of ImageMagick where these headers are based on. + enum MagickLibVersion = 0x694; + ///ditto + enum MagickLibVersionText = "6.9.4"; + } + /* * With ImageMagick 6.6.3 long and unsinged long were changed to * ssize_t and size_t. This is only a problem for 64bits windows. diff --git a/dmagick/c/policy.d b/dmagick/c/policy.d index 27e4e36..4459083 100644 --- a/dmagick/c/policy.d +++ b/dmagick/c/policy.d @@ -15,7 +15,8 @@ extern(C) FilterPolicyDomain, PathPolicyDomain, ResourcePolicyDomain, - SystemPolicyDomain + SystemPolicyDomain, + CachePolicyDomain } enum PolicyRights diff --git a/dmagick/c/token.d b/dmagick/c/token.d index 2b6480a..b934826 100644 --- a/dmagick/c/token.d +++ b/dmagick/c/token.d @@ -16,5 +16,13 @@ extern(C) TokenInfo* AcquireTokenInfo(); TokenInfo* DestroyTokenInfo(TokenInfo*); - void GetMagickToken(const(char)*, const(char)**, char*); + static if ( MagickLibVersion < 0x694 ) + { + void GetMagickToken(const(char)*, const(char)**, char*); + } + + static if ( MagickLibVersion >= 0x694 ) + { + void GetNextToken(const(char)*, const(char)**, const size_t, char*); + } } |