diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | dmagick/c/image.d | 6 | ||||
| -rw-r--r-- | dmagick/c/magickVersion.d | 9 | ||||
| -rw-r--r-- | dmagick/c/option.d | 9 | ||||
| -rw-r--r-- | dmagick/c/pixel.d | 20 |
5 files changed, 42 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile index d2d2197..bc9d5b1 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -51,7 +51,7 @@ ifneq ("$(QUANTUMDEPTH)","Q16") VERSIONS+= -version=$(subst Q,Quantum,$(QUANTUMDEPTH)) endif -ifneq ("$(MAGICKVERSION)","683") +ifneq ("$(MAGICKVERSION)","684") VERSIONS+= -version=MagickCore_$(MAGICKVERSION) endif diff --git a/dmagick/c/image.d b/dmagick/c/image.d index ae5f1d9..1a874ff 100644 --- a/dmagick/c/image.d +++ b/dmagick/c/image.d @@ -476,6 +476,12 @@ extern(C) time_t timestamp; } + + static if ( MagickLibVersion >= 0x684 ) + { + PixelIntensityMethod + intensity; /* method to generate an intensity value from a pixel */ + } } struct ImageInfo diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d index 1cea653..9431455 100644 --- a/dmagick/c/magickVersion.d +++ b/dmagick/c/magickVersion.d @@ -166,13 +166,20 @@ extern(C) ///ditto enum MagickLibVersionText = "6.8.2"; } - else + else version(MagickCore_683) { /// Defines the version of ImageMagick where these headers are based on. enum MagickLibVersion = 0x683; ///ditto enum MagickLibVersionText = "6.8.3"; } + else + { + /// Defines the version of ImageMagick where these headers are based on. + enum MagickLibVersion = 0x684; + ///ditto + enum MagickLibVersionText = "6.8.4"; + } /* * 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 ea85668..9977f16 100644 --- a/dmagick/c/option.d +++ b/dmagick/c/option.d @@ -94,7 +94,14 @@ extern(C) MagickModuleOptions, MagickMorphologyOptions, MagickNoiseOptions, - MagickOrientationOptions, + MagickOrientationOptions,"; + + static if ( MagickLibVersion >= 0x684 ) + { + options ~= "MagickPixelIntensityOptions,"; + } + + options ~= " MagickPolicyOptions, MagickPolicyDomainOptions, MagickPolicyRightsOptions, diff --git a/dmagick/c/pixel.d b/dmagick/c/pixel.d index 729d7c3..4d8b8a2 100644 --- a/dmagick/c/pixel.d +++ b/dmagick/c/pixel.d @@ -74,6 +74,19 @@ extern(C) } } + enum PixelIntensityMethod + { + UndefinedPixelIntensityMethod = 0, + AveragePixelIntensityMethod, + BrightnessPixelIntensityMethod, + LightnessPixelIntensityMethod, + Rec601LumaPixelIntensityMethod, + Rec601LuminancePixelIntensityMethod, + Rec709LumaPixelIntensityMethod, + Rec709LuminancePixelIntensityMethod, + RMSPixelIntensityMethod + } + struct DoublePixelPacket { double @@ -148,7 +161,7 @@ extern(C) static if ( MagickLibVersion >= 0x669 ) { - MagickBooleanType InterpolateMagickPixelPacket(const Image*, const CacheView*, const InterpolatePixelMethod, const double, const double, MagickPixelPacket*, ExceptionInfo*); + MagickBooleanType InterpolateMagickPixelPacket(const(Image)*, const(CacheView)*, const InterpolatePixelMethod, const double, const double, MagickPixelPacket*, ExceptionInfo*); } static if ( MagickLibVersion >= 0x678 ) @@ -162,5 +175,10 @@ extern(C) MagickRealType EncodePixelGamma(const MagickRealType); } + static if ( MagickLibVersion >= 0x684 ) + { + MagickRealType GetPixelIntensity(const(Image)* image, const(PixelPacket)* restrict); + } + void GetMagickPixelPacket(const(Image)*, MagickPixelPacket*); } |