From a2e733005b89550ff91a236a60cb0a93bfc45256 Mon Sep 17 00:00:00 2001 From: Mike Wey Date: Tue, 11 Oct 2011 22:19:49 +0200 Subject: Update the headers for ImageMagick 6.7.3 --- dmagick/c/deprecate.d | 5 +++++ dmagick/c/magickString.d | 6 ++++++ dmagick/c/magickVersion.d | 9 ++++++++- dmagick/c/utility.d | 5 ++++- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dmagick/c/deprecate.d b/dmagick/c/deprecate.d index 89d3954..32138f7 100644 --- a/dmagick/c/deprecate.d +++ b/dmagick/c/deprecate.d @@ -69,6 +69,11 @@ deprecated extern(C) const(PixelPacket)* AcquireCacheViewPixels(const(CacheView)*, const ssize_t, const ssize_t, const size_t, const size_t, ExceptionInfo*); const(PixelPacket)* AcquireImagePixels(const(Image)*, const ssize_t, const ssize_t, const size_t, const size_t, ExceptionInfo*); + static if ( MagickLibVersion >= 0x673 ) + { + FILE* OpenMagickStream(const(char)*, const(char)*); + } + Image* AllocateImage(const(ImageInfo)*); Image* AverageImages(const(Image)*, ExceptionInfo*); Image* ExtractSubimageFromImage(Image*, const(Image)*, ExceptionInfo*); diff --git a/dmagick/c/magickString.d b/dmagick/c/magickString.d index 7508888..f29b283 100644 --- a/dmagick/c/magickString.d +++ b/dmagick/c/magickString.d @@ -63,6 +63,12 @@ extern(C) ssize_t FormatMagickTime(const time_t, const size_t, char*); StringInfo* AcquireStringInfo(const size_t); + + static if ( MagickLibVersion >= 0x673 ) + { + StringInfo* BlobToStringInfo(const(void)*, const size_t); + } + StringInfo* CloneStringInfo(const(StringInfo)*); StringInfo* ConfigureFileToStringInfo(const(char)*); StringInfo* DestroyStringInfo(StringInfo*); diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d index 7422c13..6d4ccd6 100644 --- a/dmagick/c/magickVersion.d +++ b/dmagick/c/magickVersion.d @@ -44,13 +44,20 @@ extern(C) ///ditto enum MagickLibVersionText = "6.7.1"; } - else + else version(MagickCore_672) { /// Defines the version of ImageMagick where these headers are based on. enum MagickLibVersion = 0x672; ///ditto enum MagickLibVersionText = "6.7.2"; } + else + { + /// Defines the version of ImageMagick where these headers are based on. + enum MagickLibVersion = 0x673; + ///ditto + enum MagickLibVersionText = "6.7.3"; + } char* GetMagickHomeURL(); diff --git a/dmagick/c/utility.d b/dmagick/c/utility.d index 56a2387..5efd1c8 100644 --- a/dmagick/c/utility.d +++ b/dmagick/c/utility.d @@ -26,7 +26,10 @@ extern(C) char** GetPathComponents(const(char)*, size_t*); char** ListFiles(const(char)*, const(char)*, size_t*); - FILE* OpenMagickStream(const(char)*, const(char)*); + static if ( MagickLibVersion < 0x673 ) + { + FILE* OpenMagickStream(const(char)*, const(char)*); + } int SystemCommand(const MagickBooleanType, const MagickBooleanType, const(char)*, ExceptionInfo*); -- cgit v1.2.3