add support for ImageMagick 6.6.5

6 files changed, 113 insertions, 37 deletions

diff --git a/dmagick/c/compare.d b/dmagick/c/compare.d
index b9b459a..f3a9f2a 100644
--- a/dmagick/c/compare.d
+++ b/dmagick/c/compare.d
@@ -16,7 +16,9 @@ extern(C)
 		MeanSquaredErrorMetric,
 		PeakAbsoluteErrorMetric,
 		PeakSignalToNoiseRatioMetric,
-		RootMeanSquaredErrorMetric
+		RootMeanSquaredErrorMetric,
+		NormalizedCrossCorrelationErrorMetric,
+		FuzzErrorMetric
 	}
 
 	double* GetImageChannelDistortions(Image*, const(Image)*, const MetricType, ExceptionInfo*);
diff --git a/dmagick/c/deprecate.d b/dmagick/c/deprecate.d
index 32138f7..d85bcc3 100644
--- a/dmagick/c/deprecate.d
+++ b/dmagick/c/deprecate.d
@@ -201,6 +201,12 @@ deprecated extern(C)
 	void* AcquireMemory(const size_t);
 	void  AllocateNextImage(const(ImageInfo)*, Image*);
 	void* CloneMemory(void*, const(void)*, const size_t);
+
+	static if ( MagickLibVersion >= 0x655 )
+	{
+		void DestroyConstitute();
+	}
+
 	void  DestroyImageAttributes(Image*);
 	void  DestroyImages(Image*);
 	void  DestroyMagick();
diff --git a/dmagick/c/imageView.d b/dmagick/c/imageView.d
index f270141..515ce28 100644
--- a/dmagick/c/imageView.d
+++ b/dmagick/c/imageView.d
@@ -4,6 +4,7 @@ import dmagick.c.exception;
 import dmagick.c.geometry;
 import dmagick.c.image;
 import dmagick.c.magickType;
+import dmagick.c.magickVersion;
 import dmagick.c.pixel;
 
 alias ptrdiff_t ssize_t;
@@ -45,4 +46,9 @@ extern(C)
 	RectangleInfo GetImageViewExtent(const(ImageView)*);
 
 	void SetImageViewDescription(ImageView*, const(char)*);
+
+	static if ( MagickLibVersion >= 0x655 )
+	{
+		void SetImageViewThreads(ImageView*, const size_t);
+	}
 }
diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d
index 6d4ccd6..0907dcc 100644
--- a/dmagick/c/magickVersion.d
+++ b/dmagick/c/magickVersion.d
@@ -2,61 +2,68 @@ module dmagick.c.magickVersion;
 
 extern(C)
 {
+	version(MagickCore_665)
+	{
+		/// Defines the version of ImageMagick where these headers are based on.
+		enum MagickLibVersion = 0x665;
+		///ditto
+		enum MagickLibVersionText = "6.6.5";
+	}
 	version(MagickCore_666)
 	{
 		/// Defines the version of ImageMagick where these headers are based on.
 		enum MagickLibVersion = 0x666;
 		///ditto
-		enum MagickLibVersionText = "6.6.6"; 
+		enum MagickLibVersionText = "6.6.6";
 	}
 	else version(MagickCore_667)
 	{
 		/// Defines the version of ImageMagick where these headers are based on.
 		enum MagickLibVersion = 0x667;
 		///ditto
-		enum MagickLibVersionText = "6.6.7"; 
+		enum MagickLibVersionText = "6.6.7";
 	}
 	else version(MagickCore_668)
 	{
 		/// Defines the version of ImageMagick where these headers are based on.
 		enum MagickLibVersion = 0x668;
 		///ditto
-		enum MagickLibVersionText = "6.6.8"; 
+		enum MagickLibVersionText = "6.6.8";
 	}
 	else version(MagickCore_669)
 	{
 		/// Defines the version of ImageMagick where these headers are based on.
 		enum MagickLibVersion = 0x669;
 		///ditto
-		enum MagickLibVersionText = "6.6.9"; 
+		enum MagickLibVersionText = "6.6.9";
 	}
 	else version(MagickCore_670)
 	{
 		/// Defines the version of ImageMagick where these headers are based on.
 		enum MagickLibVersion = 0x670;
 		///ditto
-		enum MagickLibVersionText = "6.7.0"; 
+		enum MagickLibVersionText = "6.7.0";
 	}
 	else version(MagickCore_671)
 	{
 		/// Defines the version of ImageMagick where these headers are based on.
 		enum MagickLibVersion = 0x671;
 		///ditto
-		enum MagickLibVersionText = "6.7.1"; 
+		enum MagickLibVersionText = "6.7.1";
 	}
 	else version(MagickCore_672)
 	{
 		/// Defines the version of ImageMagick where these headers are based on.
 		enum MagickLibVersion = 0x672;
 		///ditto
-		enum MagickLibVersionText = "6.7.2"; 
+		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"; 
+		enum MagickLibVersionText = "6.7.3";
 	}
 
 	char* GetMagickHomeURL();
diff --git a/dmagick/c/resample.d b/dmagick/c/resample.d
index 455f119..4b8b30c 100644
--- a/dmagick/c/resample.d
+++ b/dmagick/c/resample.d
@@ -4,38 +4,91 @@ import dmagick.c.cacheView;
 import dmagick.c.exception;
 import dmagick.c.image;
 import dmagick.c.magickType;
+import dmagick.c.magickVersion;
 import dmagick.c.pixel;
 
+//A mixin with static if has problems with circular imports. (dmagick.c.image)
+version(MagickCore_660) {} else
+version(MagickCore_661) {} else
+version(MagickCore_662) {} else
+version(MagickCore_663) {} else
+version(MagickCore_664) {} else
+version(MagickCore_665) {} else
+{
+	version = MagickCore_666_and_up;
+}
+
 extern(C)
 {
-	enum FilterTypes
+	version ( MagickCore_666_and_up )
+	{
+		enum FilterTypes
+		{
+			UndefinedFilter,
+			PointFilter,
+			BoxFilter,
+			TriangleFilter,
+			HermiteFilter,
+			HanningFilter,
+			HammingFilter,
+			BlackmanFilter,
+			GaussianFilter,
+			QuadraticFilter,
+			CubicFilter,
+			CatromFilter,
+			MitchellFilter,
+			JincFilter,
+			SincFilter,
+			SincFastFilter,
+			KaiserFilter,
+			WelshFilter,
+			ParzenFilter,
+			BohmanFilter,
+			BartlettFilter,
+			LagrangeFilter,
+			LanczosFilter,
+			LanczosSharpFilter,
+			Lanczos2Filter,
+			Lanczos2SharpFilter,
+			RobidouxFilter,
+			SentinelFilter,  /* a count of all the filters, not a real filter */
+
+			Lanczos2DFilter      = Lanczos2Filter,
+			Lanczos2DSharpFilter = Lanczos2SharpFilter
+		}
+	}
+	else
 	{
-		UndefinedFilter,
-		PointFilter,
-		BoxFilter,
-		TriangleFilter,
-		HermiteFilter,
-		HanningFilter,
-		HammingFilter,
-		BlackmanFilter,
-		GaussianFilter,
-		QuadraticFilter,
-		CubicFilter,
-		CatromFilter,
-		MitchellFilter,
-		LanczosFilter,
-		JincFilter,
-		SincFilter,
-		KaiserFilter,
-		WelshFilter,
-		ParzenFilter,
-		LagrangeFilter,
-		BohmanFilter,
-		BartlettFilter,
-		SincFastFilter,
-		Lanczos2DFilter,
-		RobidouxFilter,
-		SentinelFilter
+		enum FilterTypes
+		{
+			UndefinedFilter,
+			PointFilter,
+			BoxFilter,
+			TriangleFilter,
+			HermiteFilter,
+			HanningFilter,
+			HammingFilter,
+			BlackmanFilter,
+			GaussianFilter,
+			QuadraticFilter,
+			CubicFilter,
+			CatromFilter,
+			MitchellFilter,
+			LanczosFilter,
+			JincFilter,
+			SincFilter,
+			KaiserFilter,
+			WelshFilter,
+			ParzenFilter,
+			LagrangeFilter,
+			BohmanFilter,
+			BartlettFilter,
+			SincFastFilter,
+			Lanczos2DFilter,
+			Lanczos2DSharpFilter,
+			RobidouxFilter,
+			SentinelFilter  /* a count of all the filters, not a real filter */
+		}
 	}
 
 	struct ResampleFilter {}
diff --git a/dmagick/c/statistic.d b/dmagick/c/statistic.d
index fba4c5e..2699cb9 100644
--- a/dmagick/c/statistic.d
+++ b/dmagick/c/statistic.d
@@ -55,7 +55,9 @@ extern(C)
 		SineEvaluateOperator,
 		AddModulusEvaluateOperator,
 		MeanEvaluateOperator,
-		AbsEvaluateOperator
+		AbsEvaluateOperator,
+		ExponentialEvaluateOperator,
+		MedianEvaluateOperator
 	}
 
 	enum MagickFunction