summaryrefslogtreecommitdiff
path: root/dmagick
diff options
context:
space:
mode:
authorMike Wey2013-10-22 22:16:15 +0200
committerMike Wey2013-10-22 22:16:15 +0200
commit66c7bc54682b28afaabe7afd3bb32ed6d2d4b52b (patch)
tree9c425a7745501d00aa1658c912d6debeaab2bda6 /dmagick
parent5556e6ae0d2241dcaa8bd5031f343643d488eb66 (diff)
Update the headers to ImageMagick version 6.8.7.ImageMagick_6.8.7
Diffstat (limited to 'dmagick')
-rw-r--r--dmagick/Image.d2
-rw-r--r--dmagick/c/accelerate.d11
-rw-r--r--dmagick/c/compare.d3
-rw-r--r--dmagick/c/magick.d12
-rw-r--r--dmagick/c/magickVersion.d9
-rw-r--r--dmagick/c/memory.d16
6 files changed, 49 insertions, 4 deletions
diff --git a/dmagick/Image.d b/dmagick/Image.d
index 21719e5..b4484b4 100644
--- a/dmagick/Image.d
+++ b/dmagick/Image.d
@@ -4460,7 +4460,7 @@ version (Posix)
{
shared static this()
{
- MagickCoreGenesis(toStringz(Runtime.args[0]) , false);
+ MagickCoreGenesis(null, false);
}
shared static ~this()
diff --git a/dmagick/c/accelerate.d b/dmagick/c/accelerate.d
index d8519a6..5a99e75 100644
--- a/dmagick/c/accelerate.d
+++ b/dmagick/c/accelerate.d
@@ -3,6 +3,15 @@ module dmagick.c.accelerate;
import dmagick.c.exception;
import dmagick.c.image;
import dmagick.c.magickType;
+import dmagick.c.magickVersion;
import dmagick.c.morphology;
-extern(C) MagickBooleanType AccelerateConvolveImage(const(Image)*, const(KernelInfo)*, Image*, ExceptionInfo*);
+extern(C)
+{
+ MagickBooleanType AccelerateConvolveImage(const(Image)*, const(KernelInfo)*, Image*, ExceptionInfo*);
+
+ static if ( MagickLibVersion >= 0x687 )
+ {
+ Image* AccelerateConvolveImageChannel(const(Image)*, const ChannelType, const(KernelInfo)*, ExceptionInfo*);
+ }
+}
diff --git a/dmagick/c/compare.d b/dmagick/c/compare.d
index dfa0617..b42ed20 100644
--- a/dmagick/c/compare.d
+++ b/dmagick/c/compare.d
@@ -19,7 +19,8 @@ extern(C)
PeakSignalToNoiseRatioMetric,
RootMeanSquaredErrorMetric,
NormalizedCrossCorrelationErrorMetric,
- FuzzErrorMetric
+ FuzzErrorMetric,
+ UndefinedErrorMetric = 0
}
double* GetImageChannelDistortions(Image*, const(Image)*, const MetricType, ExceptionInfo*);
diff --git a/dmagick/c/magick.d b/dmagick/c/magick.d
index 742c3de..06b5296 100644
--- a/dmagick/c/magick.d
+++ b/dmagick/c/magick.d
@@ -3,6 +3,7 @@ module dmagick.c.magick;
import dmagick.c.exception;
import dmagick.c.image;
import dmagick.c.magickType;
+import dmagick.c.magickVersion;
extern(C)
{
@@ -70,12 +71,23 @@ extern(C)
size_t
signature;
+
+ static if ( MagickLibVersion >= 0x687 )
+ {
+ char*
+ mime_type;
+ }
}
char** GetMagickList(const(char)*, size_t*, ExceptionInfo*);
const(char)* GetMagickDescription(const(MagickInfo)*);
+ static if ( MagickLibVersion >= 0x687 )
+ {
+ const(char)* GetMagickMimeType(const(MagickInfo)*);
+ }
+
DecodeImageHandler* GetImageDecoder(const(MagickInfo)*);
EncodeImageHandler* GetImageEncoder(const(MagickInfo)*);
diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d
index 25ff7d3..1f7a949 100644
--- a/dmagick/c/magickVersion.d
+++ b/dmagick/c/magickVersion.d
@@ -187,13 +187,20 @@ extern(C)
///ditto
enum MagickLibVersionText = "6.8.5";
}
- else
+ else version(MagickCore_686)
{
/// Defines the version of ImageMagick where these headers are based on.
enum MagickLibVersion = 0x686;
///ditto
enum MagickLibVersionText = "6.8.6";
}
+ else
+ {
+ /// Defines the version of ImageMagick where these headers are based on.
+ enum MagickLibVersion = 0x687;
+ ///ditto
+ enum MagickLibVersionText = "6.8.7";
+ }
/*
* With ImageMagick 6.6.3 long and unsinged long were changed to
diff --git a/dmagick/c/memory.d b/dmagick/c/memory.d
index ab6686f..84062c3 100644
--- a/dmagick/c/memory.d
+++ b/dmagick/c/memory.d
@@ -1,17 +1,33 @@
module dmagick.c.memory;
+import dmagick.c.magickVersion;
+
extern(C)
{
+ struct MemoryInfo;
+
alias void* function(size_t) AcquireMemoryHandler;
alias void function(void*) DestroyMemoryHandler;
alias void* function(void*, size_t) ResizeMemoryHandler;
+ static if ( MagickLibVersion >= 0x687 )
+ {
+ MemoryInfo* AcquireVirtualMemory(const size_t, const size_t);
+ MemoryInfo* RelinquishVirtualMemory(MemoryInfo*);
+ }
+
void* AcquireAlignedMemory(const size_t, const size_t);
void* AcquireMagickMemory(const size_t);
void* AcquireQuantumMemory(const size_t, const size_t);
void* CopyMagickMemory(void*, const(void)*, const size_t);
void DestroyMagickMemory();
void GetMagickMemoryMethods(AcquireMemoryHandler*, ResizeMemoryHandler*, DestroyMemoryHandler*);
+
+ static if ( MagickLibVersion >= 0x687 )
+ {
+ void* GetVirtualMemoryBlob(const(MemoryInfo)*);
+ }
+
void* RelinquishAlignedMemory(void*);
void* RelinquishMagickMemory(void*);
void* ResetMagickMemory(void*, int, const size_t);