diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | dmagick/c/magickType.d | 7 | ||||
| -rw-r--r-- | dmagick/c/magickVersion.d | 21 | ||||
| -rw-r--r-- | dmagick/c/quantum.d | 11 | ||||
| -rw-r--r-- | dmagick/c/resample.d | 1 | ||||
| -rw-r--r-- | dmagick/c/resource.d | 7 | ||||
| -rw-r--r-- | dmagick/c/statistic.d | 6 | ||||
| -rw-r--r-- | dmagick/c/threshold.d | 8 |
8 files changed, 60 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index 1eac820..b98cd9b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -49,7 +49,7 @@ ifneq ("$(QUANTUMDEPTH)","Q16") VERSIONS+= -version=$(subst Q,Quantum,$(QUANTUMDEPTH)) endif -ifneq ("$(MAGICKVERSION)","680") +ifneq ("$(MAGICKVERSION)","681") VERSIONS+= -version=MagickCore_$(MAGICKVERSION) endif diff --git a/dmagick/c/magickType.d b/dmagick/c/magickType.d index e23a918..6f3a17b 100644 --- a/dmagick/c/magickType.d +++ b/dmagick/c/magickType.d @@ -121,11 +121,16 @@ extern (C) enum MagickRealType MagickEpsilon = 1.0e-16; enum MagickRealType MagickHuge = 1.0/MagickEpsilon; } - else static if ( MagickLibVersion >= 0x680 ) + else static if ( MagickLibVersion == 0x680 ) { enum MagickRealType MagickEpsilon = 1.0e-16; enum MagickRealType MagickHuge = 3.4e+38; } + else static if ( MagickLibVersion >= 0x681 ) + { + enum MagickRealType MagickEpsilon = 1.0e-15; + enum MagickRealType MagickHuge = 3.4e+38; + } alias uint MagickStatusType; alias long MagickOffsetType; diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d index 7969591..7e629d3 100644 --- a/dmagick/c/magickVersion.d +++ b/dmagick/c/magickVersion.d @@ -1,6 +1,7 @@ module dmagick.c.magickVersion; import core.stdc.config; +import core.stdc.stdio; extern(C) { @@ -144,13 +145,20 @@ extern(C) ///ditto enum MagickLibVersionText = "6.7.9"; } - else + else version(MagickCore_680) { /// Defines the version of ImageMagick where these headers are based on. enum MagickLibVersion = 0x680; ///ditto enum MagickLibVersionText = "6.8.0"; } + else + { + /// Defines the version of ImageMagick where these headers are based on. + enum MagickLibVersion = 0x681; + ///ditto + enum MagickLibVersionText = "6.8.1"; + } /* * With ImageMagick 6.6.3 long and unsinged long were changed to @@ -164,10 +172,21 @@ extern(C) char* GetMagickHomeURL(); const(char)* GetMagickCopyright(); + + static if ( MagickLibVersion >= 0x681 ) + { + const(char)* GetMagickDelegates(); + } + const(char)* GetMagickFeatures(); const(char)* GetMagickPackageName(); const(char)* GetMagickQuantumDepth(size_t*); const(char)* GetMagickQuantumRange(size_t*); const(char)* GetMagickReleaseDate(); const(char)* GetMagickVersion(size_t*); + + static if ( MagickLibVersion >= 0x681 ) + { + void ListMagickVersion(FILE*); + } } diff --git a/dmagick/c/quantum.d b/dmagick/c/quantum.d index 7387f4f..a7b14b3 100644 --- a/dmagick/c/quantum.d +++ b/dmagick/c/quantum.d @@ -96,7 +96,18 @@ extern(C) return cast(Quantum)(factor*value); } + static if ( MagickLibVersion >= 0x681 ) + { + EndianType GetQuantumEndian(const(QuantumInfo)*); + } + MagickBooleanType SetQuantumDepth(const(Image)*, QuantumInfo*, const size_t); + + static if ( MagickLibVersion >= 0x681 ) + { + MagickBooleanType SetQuantumEndian(const(Image)*, QuantumInfo*, const EndianType); + } + MagickBooleanType SetQuantumFormat(const(Image)*, QuantumInfo*, const QuantumFormatType); MagickBooleanType SetQuantumPad(const(Image)*, QuantumInfo*, const size_t); diff --git a/dmagick/c/resample.d b/dmagick/c/resample.d index f5c3112..80dfbb4 100644 --- a/dmagick/c/resample.d +++ b/dmagick/c/resample.d @@ -68,6 +68,7 @@ extern(C) RobidouxSharpFilter, /// ditto CosineFilter, /// ditto SplineFilter, /// ditto + LanczosRadiusFilter, /// ditto SentinelFilter, // a count of all the filters, not a real filter BesselFilter = JincFilter, diff --git a/dmagick/c/resource.d b/dmagick/c/resource.d index f9f92f6..bc771b6 100644 --- a/dmagick/c/resource.d +++ b/dmagick/c/resource.d @@ -4,6 +4,7 @@ import core.stdc.stdio; import dmagick.c.exception; import dmagick.c.magickType; +import dmagick.c.magickVersion; extern(C) { @@ -23,6 +24,12 @@ extern(C) int AcquireUniqueFileResource(char*); MagickBooleanType AcquireMagickResource(const ResourceType, const MagickSizeType); + + static if ( MagickLibVersion >= 0x681 ) + { + MagickBooleanType GetPathTemplate(char*); + } + MagickBooleanType ListMagickResourceInfo(FILE*, ExceptionInfo*); MagickBooleanType RelinquishUniqueFileResource(const(char)*); MagickBooleanType ResourceComponentGenesis(); diff --git a/dmagick/c/statistic.d b/dmagick/c/statistic.d index 61ca640..6577ab5 100644 --- a/dmagick/c/statistic.d +++ b/dmagick/c/statistic.d @@ -156,6 +156,12 @@ extern(C) Image* EvaluateImages(const(Image)*, const MagickEvaluateOperator, ExceptionInfo*); } + static if ( MagickLibVersion >= 0x681 ) + { + Image* PolynomialImage(const(Image)*, const size_t, const(double)*, ExceptionInfo*); + Image* PolynomialImageChannel(const(Image)*, const ChannelType, const size_t, const(double)*, ExceptionInfo*); + } + static if ( MagickLibVersion >= 0x669 ) { Image* StatisticImage(const(Image)*, const StatisticType, const size_t, const size_t, ExceptionInfo*); diff --git a/dmagick/c/threshold.d b/dmagick/c/threshold.d index 3f7f7f1..6b2052b 100644 --- a/dmagick/c/threshold.d +++ b/dmagick/c/threshold.d @@ -5,6 +5,7 @@ import core.stdc.stdio; import dmagick.c.exception; import dmagick.c.image; import dmagick.c.magickType; +import dmagick.c.magickVersion; alias ptrdiff_t ssize_t; @@ -28,6 +29,13 @@ extern(C) MagickBooleanType OrderedDitherImageChannel(Image*, const ChannelType, ExceptionInfo*); MagickBooleanType OrderedPosterizeImage(Image*, const(char)*, ExceptionInfo*); MagickBooleanType OrderedPosterizeImageChannel(Image*, const ChannelType, const(char)*, ExceptionInfo*); + + static if ( MagickLibVersion >= 0x681 ) + { + MagickBooleanType PerceptibleImage(Image*, const double); + MagickBooleanType PerceptibleImageChannel(Image*, const ChannelType, const double); + } + MagickBooleanType RandomThresholdImage(Image*, const(char)*, ExceptionInfo*); MagickBooleanType RandomThresholdImageChannel(Image*, const ChannelType, const(char)*, ExceptionInfo*); MagickBooleanType WhiteThresholdImage(Image*, const(char)*); |