From 3abd6300bd707b5647f9c8d28fa5b83af128557d Mon Sep 17 00:00:00 2001
From: Mike Wey
Date: Sat, 9 May 2015 15:46:51 +0200
Subject: Update the headers for Imagemagick 6.9.1

---
 dmagick/DrawingContext.d  | 10 +++++-----
 dmagick/c/attribute.d     |  8 ++++++++
 dmagick/c/magickVersion.d |  9 ++++++++-
 dmagick/c/morphology.d    |  7 ++++++-
 dmagick/c/pixel.d         |  5 +++++
 dmagick/c/vision.d        | 13 +++++++++++++
 6 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 dmagick/c/vision.d

diff --git a/dmagick/DrawingContext.d b/dmagick/DrawingContext.d
index 1d9a285..1735863 100644
--- a/dmagick/DrawingContext.d
+++ b/dmagick/DrawingContext.d
@@ -993,19 +993,19 @@ class DrawingContext
 
 		version(Windows)
 		{
-			tempPath = getenv("TMP");
+			tempPath = environment.get("TMP");
 			if ( tempPath is null )
-				tempPath = getenv("TEMP");
+				tempPath = environment.get("TEMP");
 			if ( tempPath is null )
-				tempPath = buildPath(getenv("USERPROFILE"), "AppData/Local/Temp");
+				tempPath = buildPath(environment.get("USERPROFILE"), "AppData/Local/Temp");
 			if ( tempPath is null || !tempPath.exists )
-				tempPath = buildPath(getenv("WinDir"), "Temp");
+				tempPath = buildPath(environment.get("WinDir"), "Temp");
 		}
 		else
 		{
 			import core.sys.posix.stdio;
 
-			tempPath = getenv("TMPDIR");
+			tempPath = environment.get("TMPDIR");
 			if ( tempPath is null )
 				tempPath = P_tmpdir;
 		}
diff --git a/dmagick/c/attribute.d b/dmagick/c/attribute.d
index df49115..ea06926 100644
--- a/dmagick/c/attribute.d
+++ b/dmagick/c/attribute.d
@@ -3,6 +3,7 @@ module dmagick.c.attribute;
 import dmagick.c.image;
 import dmagick.c.exception;
 import dmagick.c.magickType;
+import dmagick.c.magickVersion;
 import dmagick.c.geometry;
 
 extern(C)
@@ -12,6 +13,13 @@ extern(C)
 	MagickBooleanType IsGrayImage(const(Image)*, ExceptionInfo*);
 	MagickBooleanType IsMonochromeImage(const(Image)*, ExceptionInfo*);
 	MagickBooleanType IsOpaqueImage(const(Image)*, ExceptionInfo*);
+
+	static if ( MagickLibVersion >= 0x691 )
+	{
+		MagickBooleanType SetImageGray(Image*, ExceptionInfo*);
+		MagickBooleanType SetImageMonochrome(Image*, ExceptionInfo*);
+	}
+
 	MagickBooleanType SetImageChannelDepth(Image*, const ChannelType, const size_t);
 	MagickBooleanType SetImageDepth(Image*, const size_t);
 	MagickBooleanType SetImageType(Image*, const ImageType);
diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d
index 2af8257..cf55871 100644
--- a/dmagick/c/magickVersion.d
+++ b/dmagick/c/magickVersion.d
@@ -215,13 +215,20 @@ extern(C)
 		///ditto
 		enum MagickLibVersionText = "6.8.9";
 	}
-	else
+	else version(MagickCore_690)
 	{
 		/// Defines the version of ImageMagick where these headers are based on.
 		enum MagickLibVersion = 0x690;
 		///ditto
 		enum MagickLibVersionText = "6.9.0";
 	}
+	else
+	{
+		/// Defines the version of ImageMagick where these headers are based on.
+		enum MagickLibVersion = 0x691;
+		///ditto
+		enum MagickLibVersionText = "6.9.1";
+	}
 
 	/*
 	 * With ImageMagick 6.6.3 long and unsinged long were changed to
diff --git a/dmagick/c/morphology.d b/dmagick/c/morphology.d
index 692a833..4a30495 100644
--- a/dmagick/c/morphology.d
+++ b/dmagick/c/morphology.d
@@ -219,10 +219,15 @@ extern(C)
 	{
 		void ScaleGeometryKernelInfo(KernelInfo*, const(char)*);
 	}
-	else static if ( MagickLibVersion == 0x661 )
+	static if ( MagickLibVersion == 0x661 || MagickLibVersion >= 0x691 )
 	{
 		void ScaleKernelInfo(KernelInfo*, const double, const GeometryFlags);
 	}
 
 	void ShowKernelInfo(const(KernelInfo)*);
+
+	static if ( MagickLibVersion >= 0x691 )
+	{
+		void UnityAddKernelInfo(KernelInfo*, const double);
+	}
 }
diff --git a/dmagick/c/pixel.d b/dmagick/c/pixel.d
index 34def12..34db799 100644
--- a/dmagick/c/pixel.d
+++ b/dmagick/c/pixel.d
@@ -176,6 +176,11 @@ extern(C)
 		MagickRealType EncodePixelGamma(const MagickRealType);
 	}
 
+	static if ( MagickLibVersion >= 0x691 )
+	{
+		MagickRealType GetMagickPixelIntensity(const(Image)* image, const(MagickPixelPacket)* restrict);
+	}
+
 	static if ( MagickLibVersion >= 0x684 )
 	{
 		MagickRealType GetPixelIntensity(const(Image)* image, const(PixelPacket)* restrict);
diff --git a/dmagick/c/vision.d b/dmagick/c/vision.d
new file mode 100644
index 0000000..dfc8373
--- /dev/null
+++ b/dmagick/c/vision.d
@@ -0,0 +1,13 @@
+module dmagick.c.vision;
+
+import dmagick.c.exception;
+import dmagick.c.image;
+import dmagick.c.magickVersion;
+
+extern(C)
+{
+	static if ( MagickLibVersion >= 0x664 )
+	{
+		Image* ConnectedComponentsImage(const(Image)*, const size_t, ExceptionInfo*);
+	}
+}
-- 
cgit v1.2.3