Add support for imageMagick 6.6.4 to the headers.

6 files changed, 33 insertions, 6 deletions

diff --git a/GNUmakefile b/GNUmakefile
index a88455a..347ee9a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -52,11 +52,11 @@ ifneq ("$(QUANTUMDEPTH)","Q16")
     VERSIONS+= -version=$(subst Q,Quantum,$(QUANTUMDEPTH))
 endif
 
-ifneq ("$(MAGICKVERSION)","672")
+ifneq ("$(MAGICKVERSION)","673")
     VERSIONS+= -version=MagickCore_$(MAGICKVERSION)
 endif
 
-ifndef VERSIONS
+ifdef VERSIONS
 	DCFLAGS+=$(VERSIONS)
 endif
 
diff --git a/dmagick/c/annotate.d b/dmagick/c/annotate.d
index 69fe15a..208cfa8 100644
--- a/dmagick/c/annotate.d
+++ b/dmagick/c/annotate.d
@@ -18,7 +18,14 @@ extern(C)
 	MagickBooleanType GetMultilineTypeMetrics(Image*, const(DrawInfo)*, TypeMetric*);
 	MagickBooleanType GetTypeMetrics(Image*, const(DrawInfo)*, TypeMetric*);
 
-	ssize_t FormatMagickCaption(Image*, DrawInfo*, const MagickBooleanType, TypeMetric*, char**);
+	static if ( MagickLibVersion >= 0x665 )
+	{
+		ssize_t FormatMagickCaption(Image*, DrawInfo*, const MagickBooleanType, TypeMetric*, char**);
+	}
+	else
+	{
+		ssize_t FormatMagickCaption(Image*, DrawInfo*, TypeMetric*, char**);
+	}
 
 	static if ( MagickLibVersion >= 0x668 )
 	{
diff --git a/dmagick/c/deprecate.d b/dmagick/c/deprecate.d
index d85bcc3..4b1b200 100644
--- a/dmagick/c/deprecate.d
+++ b/dmagick/c/deprecate.d
@@ -102,7 +102,11 @@ deprecated extern(C)
 
 	Image* ShiftImageList(Image**);
 	Image* SpliceImageList(Image*, const ssize_t, const size_t, const(Image)*, ExceptionInfo*);
-	Image* ZoomImage(const(Image)*, const size_t, const size_t, ExceptionInfo*);
+
+	static if ( MagickLibVersion >= 0x665 )
+	{
+		Image* ZoomImage(const(Image)*, const size_t, const size_t, ExceptionInfo*);
+	}
 
 	IndexPacket* GetCacheViewIndexes(CacheView*);
 	IndexPacket* GetIndexes(const(Image)*);
diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d
index 0907dcc..4e577a4 100644
--- a/dmagick/c/magickVersion.d
+++ b/dmagick/c/magickVersion.d
@@ -2,7 +2,14 @@ module dmagick.c.magickVersion;
 
 extern(C)
 {
-	version(MagickCore_665)
+	version(MagickCore_664)
+	{
+		/// Defines the version of ImageMagick where these headers are based on.
+		enum MagickLibVersion = 0x664;
+		///ditto
+		enum MagickLibVersionText = "6.6.4";
+	}
+	else version(MagickCore_665)
 	{
 		/// Defines the version of ImageMagick where these headers are based on.
 		enum MagickLibVersion = 0x665;
diff --git a/dmagick/c/resample.d b/dmagick/c/resample.d
index 4b8b30c..3a5323e 100644
--- a/dmagick/c/resample.d
+++ b/dmagick/c/resample.d
@@ -53,6 +53,7 @@ extern(C)
 			RobidouxFilter,
 			SentinelFilter,  /* a count of all the filters, not a real filter */
 
+			BesselFilter         = JincFilter,
 			Lanczos2DFilter      = Lanczos2Filter,
 			Lanczos2DSharpFilter = Lanczos2SharpFilter
 		}
@@ -87,7 +88,9 @@ extern(C)
 			Lanczos2DFilter,
 			Lanczos2DSharpFilter,
 			RobidouxFilter,
-			SentinelFilter  /* a count of all the filters, not a real filter */
+			SentinelFilter,  /* a count of all the filters, not a real filter */
+
+			BesselFilter         = JincFilter
 		}
 	}
 
diff --git a/dmagick/c/resize.d b/dmagick/c/resize.d
index ccf06ca..7e658a0 100644
--- a/dmagick/c/resize.d
+++ b/dmagick/c/resize.d
@@ -2,6 +2,7 @@ module dmagick.c.resize;
 
 import dmagick.c.exception;
 import dmagick.c.image;
+import dmagick.c.magickVersion;
 import dmagick.c.resample;
 
 extern(C)
@@ -15,4 +16,9 @@ extern(C)
 	Image* SampleImage(const(Image)*, const size_t, const size_t, ExceptionInfo*);
 	Image* ScaleImage(const(Image)*, const size_t, const size_t, ExceptionInfo*);
 	Image* ThumbnailImage(const(Image)*, const size_t, const size_t, ExceptionInfo*);
+
+	static if ( MagickLibVersion < 0x665 )
+	{
+		Image* ZoomImage(const(Image)*, const size_t, const size_t, ExceptionInfo*);
+	}
 }