diff options
| -rw-r--r-- | dmagick/c/accelerate.d | 17 | ||||
| -rw-r--r-- | dmagick/c/fourier.d | 21 | ||||
| -rw-r--r-- | dmagick/c/magickVersion.d | 9 | ||||
| -rw-r--r-- | dmagick/c/option.d | 11 |
4 files changed, 55 insertions, 3 deletions
diff --git a/dmagick/c/accelerate.d b/dmagick/c/accelerate.d index 5a99e75..3302691 100644 --- a/dmagick/c/accelerate.d +++ b/dmagick/c/accelerate.d @@ -1,15 +1,32 @@ module dmagick.c.accelerate; +import dmagick.c.colorspace; import dmagick.c.exception; +import dmagick.c.fx; import dmagick.c.image; import dmagick.c.magickType; import dmagick.c.magickVersion; import dmagick.c.morphology; +import dmagick.c.statistic; extern(C) { MagickBooleanType AccelerateConvolveImage(const(Image)*, const(KernelInfo)*, Image*, ExceptionInfo*); + static if ( MagickLibVersion >= 0x688 ) + { + MagickBooleanType AccelerateContrastImage(Image*, const MagickBooleanType, ExceptionInfo*); + MagickBooleanType AccelerateEqualizeImage(Image*, const ChannelType, ExceptionInfo*); + MagickBooleanType AccelerateFunctionImage(Image*, const ChannelType, const MagickFunction, const size_t, const(double)*, ExceptionInfo*); + MagickBooleanType AccelerateModulateImage(Image*, double, double, double, ColorspaceType, ExceptionInfo*); + } + + static if ( MagickLibVersion >= 0x688 ) + { + Image* AccelerateAddNoiseImage(const(Image)*, const ChannelType, const NoiseType, ExceptionInfo*); + Image* AccelerateBlurImage(const(Image)*, const ChannelType, const double, const double, ExceptionInfo*); + } + static if ( MagickLibVersion >= 0x687 ) { Image* AccelerateConvolveImageChannel(const(Image)*, const ChannelType, const(KernelInfo)*, ExceptionInfo*); diff --git a/dmagick/c/fourier.d b/dmagick/c/fourier.d index 553b71e..38b9ff1 100644 --- a/dmagick/c/fourier.d +++ b/dmagick/c/fourier.d @@ -3,9 +3,30 @@ module dmagick.c.fourier; import dmagick.c.exception; import dmagick.c.image; import dmagick.c.magickType; +import dmagick.c.magickVersion; + +static if ( MagickLibVersion >= 0x688 ) +{ + enum ComplexOperator + { + UndefinedComplexOperator, + AddComplexOperator, + ConjugateComplexOperator, + DivideComplexOperator, + MagnitudePhaseComplexOperator, + MultiplyComplexOperator, + RealImaginaryComplexOperator, + SubtractComplexOperator + } +} extern(C) { + static if ( MagickLibVersion >= 0x688 ) + { + Image* ComplexImages(const(Image)*, const ComplexOperator, ExceptionInfo*); + } + Image* ForwardFourierTransformImage(const(Image)*, const MagickBooleanType, ExceptionInfo*); Image* InverseFourierTransformImage(const(Image)*, const(Image)*, const MagickBooleanType, ExceptionInfo*); } diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d index 1f7a949..5a1890e 100644 --- a/dmagick/c/magickVersion.d +++ b/dmagick/c/magickVersion.d @@ -194,13 +194,20 @@ extern(C) ///ditto enum MagickLibVersionText = "6.8.6"; } - else + else version(MagickCore_687) { /// Defines the version of ImageMagick where these headers are based on. enum MagickLibVersion = 0x687; ///ditto enum MagickLibVersionText = "6.8.7"; } + else + { + /// Defines the version of ImageMagick where these headers are based on. + enum MagickLibVersion = 0x688; + ///ditto + enum MagickLibVersionText = "6.8.8"; + } /* * 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 a9de0e5..cad6c0f 100644 --- a/dmagick/c/option.d +++ b/dmagick/c/option.d @@ -124,8 +124,15 @@ extern(C) MagickThresholdOptions, MagickTypeOptions, MagickValidateOptions, - MagickVirtualPixelOptions - }"; + MagickVirtualPixelOptions"; + + static if ( MagickLibVersion >= 0x688 ) + { + options ~= "MagickComplexOptions, + MagickIntensityOptions,"; + } + + options ~= "}"; return options; }()); |