From f27f4ebcc5a405c97f7f82dfa65eccaf2d9af9b5 Mon Sep 17 00:00:00 2001 From: Mike Wey Date: Sat, 23 Jan 2016 18:01:47 +0100 Subject: Update the headers for Imagemagick 6.9.2 --- dmagick/c/colorspace.d | 9 +++++++++ dmagick/c/image.d | 6 ++++++ dmagick/c/magickVersion.d | 9 ++++++++- dmagick/c/option.d | 6 ++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dmagick/c/colorspace.d b/dmagick/c/colorspace.d index 30ba8da..e9e4fb7 100644 --- a/dmagick/c/colorspace.d +++ b/dmagick/c/colorspace.d @@ -1,7 +1,9 @@ module dmagick.c.colorspace; +import dmagick.c.exception; import dmagick.c.image; import dmagick.c.magickType; +import dmagick.c.magickVersion; extern(C) { @@ -207,6 +209,13 @@ extern(C) MagickBooleanType RGBTransformImage(Image*, const ColorspaceType); MagickBooleanType SetImageColorspace(Image*, const ColorspaceType); + + static if ( MagickLibVersion >= 0x692 ) + { + MagickBooleanType SetImageGray(Image*, ExceptionInfo*); + MagickBooleanType SetImageMonochrome(Image*, ExceptionInfo*); + } + MagickBooleanType TransformImageColorspace(Image*, const ColorspaceType); MagickBooleanType TransformRGBImage(Image*, const ColorspaceType); } diff --git a/dmagick/c/image.d b/dmagick/c/image.d index a7ec250..64002ac 100644 --- a/dmagick/c/image.d +++ b/dmagick/c/image.d @@ -669,6 +669,12 @@ extern(C) MagickBooleanType ClipImage(Image*); MagickBooleanType ClipImagePath(Image*, const(char)*, const MagickBooleanType); + + static if (MagickLibVersion >= 0x692) + { + MagickBooleanType CopyImagePixels(Image*, const(Image)*, const(RectangleInfo)*, const(OffsetInfo)*, ExceptionInfo*); + } + MagickBooleanType IsTaintImage(const(Image)*); MagickBooleanType IsMagickConflict(const(char)*); MagickBooleanType IsHighDynamicRangeImage(const(Image)*, ExceptionInfo*); diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d index cf55871..b478010 100644 --- a/dmagick/c/magickVersion.d +++ b/dmagick/c/magickVersion.d @@ -222,13 +222,20 @@ extern(C) ///ditto enum MagickLibVersionText = "6.9.0"; } - else + else version(MagickCore_691) { /// Defines the version of ImageMagick where these headers are based on. enum MagickLibVersion = 0x691; ///ditto enum MagickLibVersionText = "6.9.1"; } + else + { + /// Defines the version of ImageMagick where these headers are based on. + enum MagickLibVersion = 0x692; + ///ditto + enum MagickLibVersionText = "6.9.2"; + } /* * With ImageMagick 6.6.3 long and unsinged long were changed to diff --git a/dmagick/c/option.d b/dmagick/c/option.d index 89e7246..c21e6a4 100644 --- a/dmagick/c/option.d +++ b/dmagick/c/option.d @@ -132,6 +132,12 @@ extern(C) MagickIntensityOptions,"; } + static if ( MagickLibVersion >= 0x692 ) + { + options ~= "MagickGradientOptions, + MagickWeightOptions,"; + } + options ~= "}"; return options; -- cgit v1.2.3