Add support for imageMagick 6.6.3 to the headers.

4 files changed, 49 insertions, 17 deletions

diff --git a/dmagick/Image.d b/dmagick/Image.d
index 93948cc..2f992a9 100644
--- a/dmagick/Image.d
+++ b/dmagick/Image.d
@@ -2688,7 +2688,7 @@ class Image
 	 *     width  = The width of the pixel neighborhood.
 	 *     height = The height of the pixel neighborhood.
 	 */
-	void statistic(StatisticType type, size_t width, size_t height)
+	void statistic()(StatisticType type, size_t width, size_t height)
 	{
 		static if ( is(typeof(StatisticImage)) )
 		{
diff --git a/dmagick/c/color.d b/dmagick/c/color.d
index bc5596b..e9466b5 100644
--- a/dmagick/c/color.d
+++ b/dmagick/c/color.d
@@ -5,6 +5,7 @@ import core.stdc.stdio;
 import dmagick.c.exception;
 import dmagick.c.image;
 import dmagick.c.magickType;
+import dmagick.c.magickVersion;
 import dmagick.c.pixel;
 
 alias ptrdiff_t ssize_t;
@@ -67,10 +68,20 @@ extern(C)
 	MagickBooleanType IsOpacitySimilar(const(Image)*, const(PixelPacket)*, const(PixelPacket)*);
 	MagickBooleanType IsOpaqueImage(const(Image)*, ExceptionInfo*);
 	MagickBooleanType ListColorInfo(FILE*, ExceptionInfo*);
-	MagickBooleanType QueryColorCompliance(const(char)*, const ComplianceType, PixelPacket*, ExceptionInfo*);
+
+	static if ( MagickLibVersion >= 0x664 )
+	{
+		MagickBooleanType QueryColorCompliance(const(char)*, const ComplianceType, PixelPacket*, ExceptionInfo*);
+	}
+
 	MagickBooleanType QueryColorDatabase(const(char)*, PixelPacket*, ExceptionInfo*);
 	MagickBooleanType QueryColorname(const(Image)*, const(PixelPacket)*, const ComplianceType, char*, ExceptionInfo*);
-	MagickBooleanType QueryMagickColorCompliance(const(char)*, const ComplianceType, MagickPixelPacket*, ExceptionInfo*);
+
+	static if ( MagickLibVersion >= 0x664 )
+	{
+		MagickBooleanType QueryMagickColorCompliance(const(char)*, const ComplianceType, MagickPixelPacket*, ExceptionInfo*);
+	}
+
 	MagickBooleanType QueryMagickColor(const(char)*, MagickPixelPacket*, ExceptionInfo*);
 	MagickBooleanType QueryMagickColorname(const(Image)*, const(MagickPixelPacket)*, const ComplianceType, char*, ExceptionInfo*);
 
diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d
index 4e577a4..34bf80b 100644
--- a/dmagick/c/magickVersion.d
+++ b/dmagick/c/magickVersion.d
@@ -2,7 +2,14 @@ module dmagick.c.magickVersion;
 
 extern(C)
 {
-	version(MagickCore_664)
+	version(MagickCore_663)
+	{
+		/// Defines the version of ImageMagick where these headers are based on.
+		enum MagickLibVersion = 0x663;
+		///ditto
+		enum MagickLibVersionText = "6.6.3";
+	}
+	else version(MagickCore_664)
 	{
 		/// Defines the version of ImageMagick where these headers are based on.
 		enum MagickLibVersion = 0x664;
@@ -16,7 +23,7 @@ extern(C)
 		///ditto
 		enum MagickLibVersionText = "6.6.5";
 	}
-	version(MagickCore_666)
+	else version(MagickCore_666)
 	{
 		/// Defines the version of ImageMagick where these headers are based on.
 		enum MagickLibVersion = 0x666;
diff --git a/dmagick/c/statistic.d b/dmagick/c/statistic.d
index 2699cb9..8a3ffd7 100644
--- a/dmagick/c/statistic.d
+++ b/dmagick/c/statistic.d
@@ -3,6 +3,7 @@ module dmagick.c.statistic;
 import dmagick.c.exception;
 import dmagick.c.image;
 import dmagick.c.magickType;
+import dmagick.c.magickVersion;
 
 extern(C)
 {
@@ -11,18 +12,31 @@ extern(C)
 		size_t
 			depth;
 
-		double
-			minima,
-			maxima,
-			sum,
-			sum_squared,
-			sum_cubed,
-			sum_fourth_power,
-			mean,
-			variance,
-			standard_deviation,
-			kurtosis,
-			skewness;
+		static if ( MagickLibVersion >= 0x664 )
+		{
+			double
+				minima,
+				maxima,
+				sum,
+				sum_squared,
+				sum_cubed,
+				sum_fourth_power,
+				mean,
+				variance,
+				standard_deviation,
+				kurtosis,
+				skewness;
+		}
+		else
+		{
+			double
+				minima,
+				maxima,
+				mean,
+				standard_deviation,
+				kurtosis,
+				skewness;
+		}
 	}
 
 	enum MagickEvaluateOperator