diff options
| -rw-r--r-- | dmagick/c/deprecate.d | 25 | ||||
| -rw-r--r-- | dmagick/c/draw.d | 2 | ||||
| -rw-r--r-- | dmagick/c/fx.d | 14 | ||||
| -rw-r--r-- | dmagick/c/morphology.d | 9 | ||||
| -rw-r--r-- | dmagick/c/option.d | 10 | ||||
| -rw-r--r-- | dmagick/c/statistic.d | 10 |
6 files changed, 59 insertions, 11 deletions
diff --git a/dmagick/c/deprecate.d b/dmagick/c/deprecate.d index 4b1b200..e2d64fb 100644 --- a/dmagick/c/deprecate.d +++ b/dmagick/c/deprecate.d @@ -75,14 +75,23 @@ deprecated extern(C) } Image* AllocateImage(const(ImageInfo)*); - Image* AverageImages(const(Image)*, ExceptionInfo*); + + static if ( MagickLibVersion >= 0x661 ) + { + Image* AverageImages(const(Image)*, ExceptionInfo*); + } + Image* ExtractSubimageFromImage(Image*, const(Image)*, ExceptionInfo*); Image* GetImageFromMagickRegistry(const(char)*, ssize_t* id, ExceptionInfo*); Image* GetImageList(const(Image)*, const ssize_t, ExceptionInfo*); Image* GetNextImage(const(Image)*); Image* GetPreviousImage(const(Image)*); Image* FlattenImages(Image*, ExceptionInfo*); - Image* MaximumImages(const(Image)*, ExceptionInfo*); + + static if ( MagickLibVersion >= 0x661 ) + { + Image* MaximumImages(const(Image)*, ExceptionInfo*); + } static if ( MagickLibVersion >= 0x669 ) { @@ -90,10 +99,18 @@ deprecated extern(C) Image* ModeImage(const(Image)*, const double, ExceptionInfo*); } - Image* MinimumImages(const(Image)*, ExceptionInfo*); + static if ( MagickLibVersion >= 0x661 ) + { + Image* MinimumImages(const(Image)*, ExceptionInfo*); + } + Image* MosaicImages(Image*, ExceptionInfo*); Image* PopImageList(Image**); - Image* RecolorImage(const(Image)*, const size_t, const(double)*, ExceptionInfo*); + + static if ( MagickLibVersion >= 0x661 ) + { + Image* RecolorImage(const(Image)*, const size_t, const(double)*, ExceptionInfo*); + } static if ( MagickLibVersion >= 0x669 ) { diff --git a/dmagick/c/draw.d b/dmagick/c/draw.d index f1b7d63..3a74115 100644 --- a/dmagick/c/draw.d +++ b/dmagick/c/draw.d @@ -328,7 +328,7 @@ extern(C) DirectionType direction; } - else + else static if (MagickLibVersion == 0x661) { double direction; diff --git a/dmagick/c/fx.d b/dmagick/c/fx.d index 8171c4d..ac77737 100644 --- a/dmagick/c/fx.d +++ b/dmagick/c/fx.d @@ -4,6 +4,7 @@ import dmagick.c.draw; import dmagick.c.exception; import dmagick.c.image; import dmagick.c.magickType; +import dmagick.c.magickVersion; import dmagick.c.morphology; import dmagick.c.pixel; @@ -28,12 +29,23 @@ extern(C) Image* BlueShiftImage(const(Image)*, const double, ExceptionInfo*); Image* CharcoalImage(const(Image)*, const double, const double, ExceptionInfo*); Image* ColorizeImage(const(Image)*, const(char)*, const PixelPacket, ExceptionInfo*); - Image* ColorMatrixImage(const(Image)*, const(KernelInfo)* kernel, ExceptionInfo*); + + static if (MagickLibVersion >= 0x661) + { + Image* ColorMatrixImage(const(Image)*, const(KernelInfo)* kernel, ExceptionInfo*); + } + Image* FxImage(const(Image)*, const(char)*, ExceptionInfo*); Image* FxImageChannel(const(Image)*, const ChannelType, const(char)*, ExceptionInfo*); Image* ImplodeImage(const(Image)*, const double, ExceptionInfo*); Image* MorphImages(const(Image)*, const size_t, ExceptionInfo*); Image* PolaroidImage(const(Image)*, const(DrawInfo)*, const double, ExceptionInfo*); + + static if (MagickLibVersion < 0x661) + { + Image* RecolorImage(const(Image)*, const size_t, const(double)*, ExceptionInfo*); + } + Image* SepiaToneImage(const(Image)*, const double, ExceptionInfo*); Image* ShadowImage(const(Image)*, const double, const double, const ssize_t, const ssize_t, ExceptionInfo*); Image* SketchImage(const(Image)*, const double, const double, const double, ExceptionInfo*); diff --git a/dmagick/c/morphology.d b/dmagick/c/morphology.d index 5b5c814..bc27957 100644 --- a/dmagick/c/morphology.d +++ b/dmagick/c/morphology.d @@ -198,7 +198,12 @@ extern(C) KernelInfo* AcquireKernelInfo(const(char)*); KernelInfo* AcquireKernelBuiltIn(const KernelInfoType, const(GeometryInfo)*); - KernelInfo* CloneKernelInfo(const(KernelInfo)*); + + static if ( MagickLibVersion >= 0x661 ) + { + KernelInfo* CloneKernelInfo(const(KernelInfo)*); + } + KernelInfo* DestroyKernelInfo(KernelInfo*); Image* MorphologyImage(const(Image)*, const MorphologyMethod, const ssize_t, const(KernelInfo)*, ExceptionInfo*); @@ -208,7 +213,7 @@ extern(C) { void ScaleGeometryKernelInfo(KernelInfo*, const(char)*); } - else + else static if ( MagickLibVersion == 0x661 ) { void ScaleKernelInfo(KernelInfo*, const double, const GeometryFlags); } diff --git a/dmagick/c/option.d b/dmagick/c/option.d index f992b9d..06e6bf6 100644 --- a/dmagick/c/option.d +++ b/dmagick/c/option.d @@ -41,8 +41,14 @@ extern(C) MagickDataTypeOptions, MagickDebugOptions, MagickDecorateOptions, - MagickDelegateOptions, - MagickDirectionOptions, + MagickDelegateOptions,"; + + static if ( MagickLibVersion >= 0x661 ) + { + options ~= "MagickDirectionOptions,"; + } + + options ~= " MagickDisposeOptions, MagickDistortOptions, MagickDitherOptions, diff --git a/dmagick/c/statistic.d b/dmagick/c/statistic.d index 8a3ffd7..0bd7841 100644 --- a/dmagick/c/statistic.d +++ b/dmagick/c/statistic.d @@ -85,7 +85,15 @@ extern(C) ChannelStatistics* GetImageChannelStatistics(const(Image)*, ExceptionInfo*); - Image* EvaluateImages(const(Image)*, const MagickEvaluateOperator, ExceptionInfo*); + static if ( MagickLibVersion < 0x661 ) + { + Image* AverageImages(const(Image)*, ExceptionInfo*); + } + + static if ( MagickLibVersion >= 0x661 ) + { + Image* EvaluateImages(const(Image)*, const MagickEvaluateOperator, ExceptionInfo*); + } MagickBooleanType EvaluateImage(Image*, const MagickEvaluateOperator, const double, ExceptionInfo*); MagickBooleanType EvaluateImageChannel(Image*, const ChannelType, const MagickEvaluateOperator, const double, ExceptionInfo*); |