diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | dmagick/c/compare.d | 5 | ||||
| -rw-r--r-- | dmagick/c/distort.d | 2 | ||||
| -rw-r--r-- | dmagick/c/log.d | 1 | ||||
| -rw-r--r-- | dmagick/c/magickString.d | 5 | ||||
| -rw-r--r-- | dmagick/c/magickVersion.d | 9 | ||||
| -rw-r--r-- | dmagick/c/quantum.d | 5 | ||||
| -rw-r--r-- | dmagick/c/shear.d | 13 |
8 files changed, 38 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile index 0d3d9f6..bae208b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -53,7 +53,7 @@ ifneq ("$(QUANTUMDEPTH)","Q16") VERSIONS+= -version=$(subst Q,Quantum,$(QUANTUMDEPTH)) endif -ifneq ("$(MAGICKVERSION)","673") +ifneq ("$(MAGICKVERSION)","674") VERSIONS+= -version=MagickCore_$(MAGICKVERSION) endif diff --git a/dmagick/c/compare.d b/dmagick/c/compare.d index f3a9f2a..8a988ef 100644 --- a/dmagick/c/compare.d +++ b/dmagick/c/compare.d @@ -27,6 +27,11 @@ extern(C) Image* CompareImages(Image*, const(Image)*, const MetricType, double*, ExceptionInfo*); Image* SimilarityImage(Image*, const(Image)*, RectangleInfo*, double*, ExceptionInfo*); + static if ( MagickLibVersion >= 0x674 ) + { + Image* SimilarityMetricImage(Image*, const(Image)*, const MetricType, RectangleInfo*, double*, ExceptionInfo*); + } + MagickBooleanType GetImageChannelDistortion(Image*, const(Image)*, const ChannelType, const MetricType, double*, ExceptionInfo*); MagickBooleanType GetImageDistortion(Image*, const(Image)*, const MetricType, double*, ExceptionInfo*); MagickBooleanType IsImagesEqual(Image*, const(Image)*); diff --git a/dmagick/c/distort.d b/dmagick/c/distort.d index 6246ed8..10c96f4 100644 --- a/dmagick/c/distort.d +++ b/dmagick/c/distort.d @@ -322,6 +322,7 @@ extern(C) InverseColorInterpolate } + Image* AffineTransformImage(const(Image)*, const(AffineMatrix)*, ExceptionInfo*); Image* DistortImage(const(Image)*, const DistortImageMethod, const size_t, const(double)*, MagickBooleanType, ExceptionInfo* exception); static if ( MagickLibVersion >= 0x670 ) @@ -329,5 +330,6 @@ extern(C) Image* DistortResizeImage(const(Image)*, const size_t, const size_t, ExceptionInfo*); } + Image* RotateImage(const(Image)*, const double, ExceptionInfo*); Image* SparseColorImage(const(Image)*, const ChannelType, const SparseColorMethod, const size_t, const(double)*, ExceptionInfo*); } diff --git a/dmagick/c/log.d b/dmagick/c/log.d index eba0afc..767f402 100644 --- a/dmagick/c/log.d +++ b/dmagick/c/log.d @@ -33,6 +33,7 @@ extern(C) UserEvent = 0x09000, WandEvent = 0x10000, X11Event = 0x20000, + AccelerateEvent = 0x40000, AllEvents = 0x7fffffff } } diff --git a/dmagick/c/magickString.d b/dmagick/c/magickString.d index f29b283..ee931ce 100644 --- a/dmagick/c/magickString.d +++ b/dmagick/c/magickString.d @@ -41,6 +41,11 @@ extern(C) const(char)* GetStringInfoPath(const(StringInfo)*); + static if ( MagickLibVersion >= 0x674 ) + { + double InterpretSiPrefixValue(const(char)*, char**); + } + int CompareStringInfo(const(StringInfo)*, const(StringInfo)*); int LocaleCompare(const(char)*, const(char)*); int LocaleNCompare(const(char)*, const(char)*, const size_t); diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d index 37a5b53..546ee9d 100644 --- a/dmagick/c/magickVersion.d +++ b/dmagick/c/magickVersion.d @@ -95,13 +95,20 @@ extern(C) ///ditto enum MagickLibVersionText = "6.7.2"; } - else + else version(MagickCore_673) { /// Defines the version of ImageMagick where these headers are based on. enum MagickLibVersion = 0x673; ///ditto enum MagickLibVersionText = "6.7.3"; } + else + { + /// Defines the version of ImageMagick where these headers are based on. + enum MagickLibVersion = 0x674; + ///ditto + enum MagickLibVersionText = "6.7.4"; + } /* * With ImageMagick 6.6.3 long and unsinged long were changed to diff --git a/dmagick/c/quantum.d b/dmagick/c/quantum.d index c9c00ef..74e460d 100644 --- a/dmagick/c/quantum.d +++ b/dmagick/c/quantum.d @@ -99,6 +99,11 @@ extern(C) MagickBooleanType SetQuantumFormat(const(Image)*, QuantumInfo*, const QuantumFormatType); MagickBooleanType SetQuantumPad(const(Image)*, QuantumInfo*, const size_t); + static if ( MagickLibVersion >= 0x674 ) + { + QuantumFormatType GetQuantumFormat(const(QuantumInfo)*); + } + QuantumInfo* AcquireQuantumInfo(const(ImageInfo)*, Image*); QuantumInfo* DestroyQuantumInfo(QuantumInfo*); diff --git a/dmagick/c/shear.d b/dmagick/c/shear.d index 1e1dd03..f4e7d78 100644 --- a/dmagick/c/shear.d +++ b/dmagick/c/shear.d @@ -6,8 +6,17 @@ import dmagick.c.image; extern(C) { - Image* AffineTransformImage(const(Image)*, const(AffineMatrix)*, ExceptionInfo*); Image* DeskewImage(const(Image)*, const double, ExceptionInfo*); - Image* RotateImage(const(Image)*, const double, ExceptionInfo*); + + static if ( MagickLibVersion >= 0x674 ) + { + Image* IntegralRotateImage(const(Image)*, size_t, ExceptionInfo*); + } + Image* ShearImage(const(Image)*, const double, const double, ExceptionInfo*); + + static if ( MagickLibVersion >= 0x674 ) + { + Image* ShearRotateImage(const(Image)*, const double, ExceptionInfo*); + } } |