diff options
Diffstat (limited to 'dmagick')
| -rw-r--r-- | dmagick/c/accelerate.d | 9 | ||||
| -rw-r--r-- | dmagick/c/attribute.d | 8 | ||||
| -rw-r--r-- | dmagick/c/color.d | 1 | ||||
| -rw-r--r-- | dmagick/c/distort.d | 8 | ||||
| -rw-r--r-- | dmagick/c/draw.d | 9 | ||||
| -rw-r--r-- | dmagick/c/effect.d | 5 | ||||
| -rw-r--r-- | dmagick/c/histogram.d | 6 | ||||
| -rw-r--r-- | dmagick/c/image.d | 5 | ||||
| -rw-r--r-- | dmagick/c/locale.d | 5 | ||||
| -rw-r--r-- | dmagick/c/magickString.d | 4 | ||||
| -rw-r--r-- | dmagick/c/magickVersion.d | 10 |
11 files changed, 63 insertions, 7 deletions
diff --git a/dmagick/c/accelerate.d b/dmagick/c/accelerate.d index d001828..22b108b 100644 --- a/dmagick/c/accelerate.d +++ b/dmagick/c/accelerate.d @@ -39,6 +39,15 @@ extern(C) static if ( MagickLibVersion >= 0x687 ) { Image* AccelerateConvolveImageChannel(const(Image)*, const ChannelType, const(KernelInfo)*, ExceptionInfo*); + Image* AccelerateDespeckleImage(const(Image)*, ExceptionInfo*); + Image* AccelerateRadialBlurImage(const(Image)*, const ChannelType, const double, ExceptionInfo*); + //Image* AccelerateResizeImage(const(Image)*, const size_t, const size_t, const(ResizeFilter)*, ExceptionInfo*); + Image* AccelerateUnsharpMaskImage(const(Image)*, const ChannelType, const double, const double, const double, const double, ExceptionInfo*); + } + + static if ( MagickLibVersion >= 0x693 ) + { + Image* AccelerateLocalContrastImage(const(Image)*, const double, const double, ExceptionInfo*); } static if ( MagickLibVersion >= 0x689 ) diff --git a/dmagick/c/attribute.d b/dmagick/c/attribute.d index ea06926..769be2e 100644 --- a/dmagick/c/attribute.d +++ b/dmagick/c/attribute.d @@ -10,6 +10,14 @@ extern(C) { ImageType GetImageType(const(Image)*, ExceptionInfo*); + static if ( MagickLibVersion >= 0x693 ) + { + ImageType IdentifyImageGray(const(Image)*, ExceptionInfo*); + ImageType IdentifyImageType(const(Image)*, ExceptionInfo*); + + MagickBooleanType IdentifyImageMonochrome(const(Image)*, ExceptionInfo*); + } + MagickBooleanType IsGrayImage(const(Image)*, ExceptionInfo*); MagickBooleanType IsMonochromeImage(const(Image)*, ExceptionInfo*); MagickBooleanType IsOpaqueImage(const(Image)*, ExceptionInfo*); diff --git a/dmagick/c/color.d b/dmagick/c/color.d index e9466b5..04b7aaf 100644 --- a/dmagick/c/color.d +++ b/dmagick/c/color.d @@ -16,6 +16,7 @@ extern(C) { UndefinedCompliance, NoCompliance = 0x0000, + CSSCompliance = 0x0001, SVGCompliance = 0x0001, X11Compliance = 0x0002, XPMCompliance = 0x0004, diff --git a/dmagick/c/distort.d b/dmagick/c/distort.d index 0ad37bd..3a1c511 100644 --- a/dmagick/c/distort.d +++ b/dmagick/c/distort.d @@ -320,7 +320,13 @@ extern(C) * of ShepardsColorInterpolate Generating spots of color in a sea * of the average of colors. */ - InverseColorInterpolate + InverseColorInterpolate, + + /** + * Like voronoi, but resulting polygonal 'cells' are mapped + * to fixed coordinate system. + */ + ManhattanColorInterpolate } Image* AffineTransformImage(const(Image)*, const(AffineMatrix)*, ExceptionInfo*); diff --git a/dmagick/c/draw.d b/dmagick/c/draw.d index 5621ed7..40f5cf5 100644 --- a/dmagick/c/draw.d +++ b/dmagick/c/draw.d @@ -271,6 +271,15 @@ extern(C) MagickRealType radius; + + static if ( MagickLibVersion >= 0x693 ) + { + MagickRealType + angle; + + PointInfo + radii; + } } struct ElementReference diff --git a/dmagick/c/effect.d b/dmagick/c/effect.d index 7932ba2..f6ba59e 100644 --- a/dmagick/c/effect.d +++ b/dmagick/c/effect.d @@ -67,6 +67,11 @@ extern(C) Image* KuwaharaImageChannel(const(Image)*, const ChannelType, const double, const double, ExceptionInfo*); } + static if ( MagickLibVersion >= 0x693 ) + { + Image* LocalContrastImage(const(Image)*, const double, const double, ExceptionInfo*); + } + static if ( MagickLibVersion < 0x669 ) { Image* MedianFilterImage(const(Image)*, const double, ExceptionInfo*); diff --git a/dmagick/c/histogram.d b/dmagick/c/histogram.d index 1722415..5349579 100644 --- a/dmagick/c/histogram.d +++ b/dmagick/c/histogram.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; import dmagick.c.pixel; extern(C) @@ -25,6 +26,11 @@ extern(C) Image* UniqueImageColors(const(Image)*, ExceptionInfo*); + static if ( MagickLibVersion >= 0x693 ) + { + MagickBooleanType IdentifyPaletteImage(const(Image)*, ExceptionInfo*); + } + MagickBooleanType IsHistogramImage(const(Image)*, ExceptionInfo*); MagickBooleanType IsPaletteImage(const(Image)*, ExceptionInfo*); MagickBooleanType MinMaxStretchImage(Image*, const ChannelType, const double, const double); diff --git a/dmagick/c/image.d b/dmagick/c/image.d index 64002ac..ab74432 100644 --- a/dmagick/c/image.d +++ b/dmagick/c/image.d @@ -495,6 +495,11 @@ extern(C) /** Total animation duration sum(delay*iterations) */ size_t duration; } + + static if ( MagickLibVersion >= 0x693 ) + { + long tietz_offset; + } } struct ImageInfo diff --git a/dmagick/c/locale.d b/dmagick/c/locale.d index cf8be8e..7797ec6 100644 --- a/dmagick/c/locale.d +++ b/dmagick/c/locale.d @@ -42,6 +42,9 @@ extern(C) double InterpretLocaleValue(const(char)*, char**); } + int LocaleCompare(const(char)*, const(char)*); + int LocaleNCompare(const(char)*, const(char)*, const size_t); + LinkedListInfo* DestroyLocaleOptions(LinkedListInfo*); LinkedListInfo* GetLocaleOptions(const(char)*, ExceptionInfo*); @@ -57,4 +60,6 @@ extern(C) } void LocaleComponentTerminus(); + void LocaleLower(char*); + void LocaleUpper(char*); } diff --git a/dmagick/c/magickString.d b/dmagick/c/magickString.d index a10eec4..d82ab55 100644 --- a/dmagick/c/magickString.d +++ b/dmagick/c/magickString.d @@ -51,8 +51,6 @@ extern(C) } int CompareStringInfo(const(StringInfo)*, const(StringInfo)*); - int LocaleCompare(const(char)*, const(char)*); - int LocaleNCompare(const(char)*, const(char)*, const size_t); MagickBooleanType ConcatenateString(char**, const(char)*); @@ -95,8 +93,6 @@ extern(C) ubyte* GetStringInfoDatum(const(StringInfo)*); void ConcatenateStringInfo(StringInfo*, const(StringInfo)*); - void LocaleLower(char*); - void LocaleUpper(char*); void PrintStringInfo(FILE *file, const(char)*, const(StringInfo)*); void ResetStringInfo(StringInfo*); void SetStringInfo(StringInfo*, const(StringInfo)*); diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d index b478010..55a3e7e 100644 --- a/dmagick/c/magickVersion.d +++ b/dmagick/c/magickVersion.d @@ -229,14 +229,20 @@ extern(C) ///ditto enum MagickLibVersionText = "6.9.1"; } - else + else version(MagickCore_692) { /// Defines the version of ImageMagick where these headers are based on. enum MagickLibVersion = 0x692; ///ditto enum MagickLibVersionText = "6.9.2"; } - + else + { + /// Defines the version of ImageMagick where these headers are based on. + enum MagickLibVersion = 0x693; + ///ditto + enum MagickLibVersionText = "6.9.3"; + } /* * With ImageMagick 6.6.3 long and unsinged long were changed to * ssize_t and size_t. This is only a problem for 64bits windows. |
