diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | dmagick/Image.d | 2 | ||||
| -rw-r--r-- | dmagick/c/effect.d | 58 | ||||
| -rw-r--r-- | dmagick/c/magickVersion.d | 9 | ||||
| -rw-r--r-- | dmagick/c/statistic.d | 57 |
5 files changed, 67 insertions, 61 deletions
diff --git a/GNUmakefile b/GNUmakefile index bae208b..11019ff 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -53,7 +53,7 @@ ifneq ("$(QUANTUMDEPTH)","Q16") VERSIONS+= -version=$(subst Q,Quantum,$(QUANTUMDEPTH)) endif -ifneq ("$(MAGICKVERSION)","674") +ifneq ("$(MAGICKVERSION)","675") VERSIONS+= -version=MagickCore_$(MAGICKVERSION) endif diff --git a/dmagick/Image.d b/dmagick/Image.d index b68c220..4c29f47 100644 --- a/dmagick/Image.d +++ b/dmagick/Image.d @@ -81,7 +81,7 @@ public alias dmagick.c.image.ResolutionType ResolutionType; /// See_Also: $(CXREF distort, _SparseColorMethod) public alias dmagick.c.distort.SparseColorMethod SparseColorMethod; /// See_Also: $(CXREF effect, _StatisticType) -public alias dmagick.c.effect.StatisticType StatisticType; +public alias dmagick.c.statistic.StatisticType StatisticType; /// See_Also: $(CXREF constitute, _StorageType) public alias dmagick.c.constitute.StorageType StorageType; /// See_Also: $(CXREF draw, _TypeMetric) diff --git a/dmagick/c/effect.d b/dmagick/c/effect.d index f70ae63..e9e84a8 100644 --- a/dmagick/c/effect.d +++ b/dmagick/c/effect.d @@ -45,57 +45,6 @@ extern(C) JPEGPreview /// ditto } - version(D_Ddoc) - { - /** - * The statistic method to apply. - */ - enum StatisticType - { - UndefinedStatistic, /// - GradientStatistic, /// Maximum difference in area. - MaximumStatistic, /// Maximum value per channel in neighborhood. - MeanStatistic, /// Average value per channel in neighborhood. - MedianStatistic, /// Median value per channel in neighborhood. - MinimumStatistic, /// Minimum value per channel in neighborhood. - ModeStatistic, /// Mode (most frequent) value per channel in neighborhood. - NonpeakStatistic, /// Value just before or after the median value per channel in neighborhood. - StandardDeviationStatistic /// - } - } - else - { - mixin( - { - string types = "enum StatisticType - { - UndefinedStatistic,"; - - static if ( MagickLibVersion >= 0x670 ) - { - types ~= "GradientStatistic,"; - } - - types ~= " - MaximumStatistic, - MeanStatistic, - MedianStatistic, - MinimumStatistic, - ModeStatistic, - NonpeakStatistic,"; - - static if ( MagickLibVersion >= 0x670 ) - { - types ~= "StandardDeviationStatistic,"; - } - - types ~= " - }"; - - return types; - }()); - } - Image* AdaptiveBlurImage(const(Image)*, const double, const double, ExceptionInfo*); Image* AdaptiveBlurImageChannel(const(Image)*, const ChannelType, const double, const double, ExceptionInfo*); Image* AdaptiveSharpenImage(const(Image)*, const double, const double, ExceptionInfo*); @@ -139,13 +88,6 @@ extern(C) Image* SharpenImage(const(Image)*, const double, const double, ExceptionInfo*); Image* SharpenImageChannel(const(Image)*, const ChannelType ,const double, const double, ExceptionInfo*); Image* SpreadImage(const(Image)*, const double, ExceptionInfo*); - - static if ( MagickLibVersion >= 0x669 ) - { - Image* StatisticImage(const(Image)*, const StatisticType, const size_t, const size_t, ExceptionInfo*); - Image* StatisticImageChannel(const(Image)*, const ChannelType, const StatisticType, const size_t, const size_t, ExceptionInfo*); - } - Image* UnsharpMaskImage(const(Image)*, const double, const double, const double, const double, ExceptionInfo*); Image* UnsharpMaskImageChannel(const(Image)*, const ChannelType, const double, const double, const double, const double, ExceptionInfo*); } diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d index 546ee9d..34c1e55 100644 --- a/dmagick/c/magickVersion.d +++ b/dmagick/c/magickVersion.d @@ -102,13 +102,20 @@ extern(C) ///ditto enum MagickLibVersionText = "6.7.3"; } - else + else version(MagickCore_674) { /// Defines the version of ImageMagick where these headers are based on. enum MagickLibVersion = 0x674; ///ditto enum MagickLibVersionText = "6.7.4"; } + else + { + /// Defines the version of ImageMagick where these headers are based on. + enum MagickLibVersion = 0x675; + ///ditto + enum MagickLibVersionText = "6.7.5"; + } /* * With ImageMagick 6.6.3 long and unsinged long were changed to diff --git a/dmagick/c/statistic.d b/dmagick/c/statistic.d index cf0703c..ff9d37d 100644 --- a/dmagick/c/statistic.d +++ b/dmagick/c/statistic.d @@ -92,6 +92,57 @@ extern(C) ArctanFunction /// ditto } + version(D_Ddoc) + { + /** + * The statistic method to apply. + */ + enum StatisticType + { + UndefinedStatistic, /// + GradientStatistic, /// Maximum difference in area. + MaximumStatistic, /// Maximum value per channel in neighborhood. + MeanStatistic, /// Average value per channel in neighborhood. + MedianStatistic, /// Median value per channel in neighborhood. + MinimumStatistic, /// Minimum value per channel in neighborhood. + ModeStatistic, /// Mode (most frequent) value per channel in neighborhood. + NonpeakStatistic, /// Value just before or after the median value per channel in neighborhood. + StandardDeviationStatistic /// + } + } + else + { + mixin( + { + string types = "enum StatisticType + { + UndefinedStatistic,"; + + static if ( MagickLibVersion >= 0x670 ) + { + types ~= "GradientStatistic,"; + } + + types ~= " + MaximumStatistic, + MeanStatistic, + MedianStatistic, + MinimumStatistic, + ModeStatistic, + NonpeakStatistic,"; + + static if ( MagickLibVersion >= 0x670 ) + { + types ~= "StandardDeviationStatistic,"; + } + + types ~= " + }"; + + return types; + }()); + } + ChannelStatistics* GetImageChannelStatistics(const(Image)*, ExceptionInfo*); static if ( MagickLibVersion < 0x661 ) @@ -104,6 +155,12 @@ extern(C) Image* EvaluateImages(const(Image)*, const MagickEvaluateOperator, ExceptionInfo*); } + static if ( MagickLibVersion >= 0x669 ) + { + Image* StatisticImage(const(Image)*, const StatisticType, const size_t, const size_t, ExceptionInfo*); + Image* StatisticImageChannel(const(Image)*, const ChannelType, const StatisticType, const size_t, const size_t, ExceptionInfo*); + } + MagickBooleanType EvaluateImage(Image*, const MagickEvaluateOperator, const double, ExceptionInfo*); MagickBooleanType EvaluateImageChannel(Image*, const ChannelType, const MagickEvaluateOperator, const double, ExceptionInfo*); MagickBooleanType FunctionImage(Image*, const MagickFunction, const size_t, const(double)*, ExceptionInfo*); |