summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Wey2012-05-20 17:08:47 +0200
committerMike Wey2012-05-20 17:08:47 +0200
commit21930f0002063d835af389a5477719fef1d6ae99 (patch)
tree0ca22c48ebe4b3e33bb45d4c8e7a37c8e8167845
parent60506cb210f51423ece9f2504b7e752d70396ffa (diff)
Update the c headers for ImageMagick 6.7.7.ImageMagick_6.7.7
-rw-r--r--GNUmakefile2
-rw-r--r--dmagick/c/cache.d14
-rw-r--r--dmagick/c/cacheView.d11
-rw-r--r--dmagick/c/image.d4
-rw-r--r--dmagick/c/magickString.d11
-rw-r--r--dmagick/c/magickVersion.d9
-rw-r--r--dmagick/c/random.d13
-rw-r--r--dmagick/c/resample.d4
-rw-r--r--dmagick/c/token.d1
-rw-r--r--dmagick/c/utility.d1
10 files changed, 65 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 39074bf..1aef534 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -49,7 +49,7 @@ ifneq ("$(QUANTUMDEPTH)","Q16")
VERSIONS+= -version=$(subst Q,Quantum,$(QUANTUMDEPTH))
endif
-ifneq ("$(MAGICKVERSION)","676")
+ifneq ("$(MAGICKVERSION)","677")
VERSIONS+= -version=MagickCore_$(MAGICKVERSION)
endif
diff --git a/dmagick/c/cache.d b/dmagick/c/cache.d
index 12bb8e1..0cb7e93 100644
--- a/dmagick/c/cache.d
+++ b/dmagick/c/cache.d
@@ -10,6 +10,20 @@ alias ptrdiff_t ssize_t;
extern(C)
{
+ enum CacheType
+ {
+ UndefinedCache,
+ MemoryCache,
+ MapCache,
+ DiskCache,
+ PingCache
+ }
+
+ static if ( MagickLibVersion >= 0x677 )
+ {
+ CacheType GetImagePixelCacheType(const(Image)*);
+ }
+
const(IndexPacket)* GetVirtualIndexQueue(const(Image)*);
const(PixelPacket)* GetVirtualPixels(const(Image)*, const ssize_t, const ssize_t, const size_t, const size_t, ExceptionInfo*);
diff --git a/dmagick/c/cacheView.d b/dmagick/c/cacheView.d
index 24e1dd0..72db65b 100644
--- a/dmagick/c/cacheView.d
+++ b/dmagick/c/cacheView.d
@@ -103,7 +103,18 @@ extern(C)
struct CacheView {}
+ static if ( MagickLibVersion >= 0x677 )
+ {
+ CacheView* AcquireAuthenticCacheView(const(Image)*, ExceptionInfo*);
+ }
+
CacheView* AcquireCacheView(const(Image)*);
+
+ static if ( MagickLibVersion >= 0x677 )
+ {
+ CacheView* AcquireVirtualCacheView(const(Image)*, ExceptionInfo*);
+ }
+
CacheView* CloneCacheView(const(CacheView)*);
CacheView* DestroyCacheView(CacheView*);
diff --git a/dmagick/c/image.d b/dmagick/c/image.d
index 5bf8843..db3a077 100644
--- a/dmagick/c/image.d
+++ b/dmagick/c/image.d
@@ -394,8 +394,8 @@ extern(C)
char[MaxTextExtent]
filename, /* images input filename */
- magick_filename,
- magick;
+ magick_filename, /* ditto with coders, and read_mods */
+ magick; /* Coder used to decode image */
size_t
magick_columns,
diff --git a/dmagick/c/magickString.d b/dmagick/c/magickString.d
index ee931ce..a10eec4 100644
--- a/dmagick/c/magickString.d
+++ b/dmagick/c/magickString.d
@@ -45,12 +45,23 @@ extern(C)
{
double InterpretSiPrefixValue(const(char)*, char**);
}
+ static if ( MagickLibVersion >= 0x677 )
+ {
+ double* StringToArrayOfDoubles(const(char)*, ssize_t*, ExceptionInfo*);
+ }
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)*);
+
+ static if ( MagickLibVersion >= 0x677 )
+ {
+ MagickBooleanType IsStringTrue(const(char)*);
+ MagickBooleanType IsStringNotFalse(const(char)*);
+ }
+
MagickBooleanType SubstituteString(char**, const(char)*, const(char)*);
size_t ConcatenateMagickString(char*, const(char)*, const size_t);
diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d
index b5be9a5..b50fba5 100644
--- a/dmagick/c/magickVersion.d
+++ b/dmagick/c/magickVersion.d
@@ -116,13 +116,20 @@ extern(C)
///ditto
enum MagickLibVersionText = "6.7.5";
}
- else
+ else version(MagickCore_676)
{
/// Defines the version of ImageMagick where these headers are based on.
enum MagickLibVersion = 0x676;
///ditto
enum MagickLibVersionText = "6.7.6";
}
+ else
+ {
+ /// Defines the version of ImageMagick where these headers are based on.
+ enum MagickLibVersion = 0x677;
+ ///ditto
+ enum MagickLibVersionText = "6.7.7";
+ }
/*
* With ImageMagick 6.6.3 long and unsinged long were changed to
diff --git a/dmagick/c/random.d b/dmagick/c/random.d
index 4af5ffd..02dd4df 100644
--- a/dmagick/c/random.d
+++ b/dmagick/c/random.d
@@ -1,5 +1,7 @@
module dmagick.c.random;
+import core.stdc.config;
+
import dmagick.c.magickString;
import dmagick.c.magickType;
@@ -17,8 +19,19 @@ extern(C)
StringInfo* GetRandomKey(RandomInfo*, const size_t);
+ static if ( MagickLibVersion >= 0x677 )
+ {
+ c_ulong GetRandomSecretKey(const(RandomInfo)*);
+ }
+
void RandomComponentTerminus();
void SeedPseudoRandomGenerator(const size_t);
void SetRandomKey(RandomInfo*, const size_t, ubyte*);
+
+ static if ( MagickLibVersion >= 0x677 )
+ {
+ void SetRandomSecretKey(const c_ulong);
+ }
+
void SetRandomTrueRandom(const MagickBooleanType);
}
diff --git a/dmagick/c/resample.d b/dmagick/c/resample.d
index 031ab96..f408286 100644
--- a/dmagick/c/resample.d
+++ b/dmagick/c/resample.d
@@ -65,6 +65,8 @@ extern(C)
Lanczos2Filter, /// ditto
Lanczos2SharpFilter, /// ditto
RobidouxFilter, /// ditto
+ RobidouxSharpFilter, /// ditto
+ CosineFilter, /// ditto
SentinelFilter, // a count of all the filters, not a real filter
BesselFilter = JincFilter,
@@ -102,6 +104,8 @@ extern(C)
Lanczos2DFilter,
Lanczos2DSharpFilter,
RobidouxFilter,
+ RobidouxSharpFilter,
+ CosineFilter,
SentinelFilter, /* a count of all the filters, not a real filter */
BesselFilter = JincFilter
diff --git a/dmagick/c/token.d b/dmagick/c/token.d
index b5371cc..2b6480a 100644
--- a/dmagick/c/token.d
+++ b/dmagick/c/token.d
@@ -11,6 +11,7 @@ extern(C)
MagickBooleanType GlobExpression(const(char)*, const(char)*, const MagickBooleanType);
MagickBooleanType IsGlob(const(char)*);
+ MagickBooleanType IsMagickTrue(const(char)*);
TokenInfo* AcquireTokenInfo();
TokenInfo* DestroyTokenInfo(TokenInfo*);
diff --git a/dmagick/c/utility.d b/dmagick/c/utility.d
index e659aad..b83d5ee 100644
--- a/dmagick/c/utility.d
+++ b/dmagick/c/utility.d
@@ -39,7 +39,6 @@ extern(C)
MagickBooleanType ExpandFilenames(int*, char***);
MagickBooleanType GetPathAttributes(const(char)*, void*);
MagickBooleanType GetExecutionPath(char*, const size_t);
- MagickBooleanType IsMagickTrue(const(char)*);
MagickBooleanType IsPathAccessible(const(char)*);
size_t MultilineCensus(const(char)*);