Update headers to version 6.7.0ImageMagick_6.7.0

15 files changed, 138 insertions, 70 deletions

diff --git a/dmagick/c/cacheView.d b/dmagick/c/cacheView.d
index ee46f76..7d423f2 100644
--- a/dmagick/c/cacheView.d
+++ b/dmagick/c/cacheView.d
@@ -34,6 +34,10 @@ extern(C)
 
 	struct CacheView {}
 
+	CacheView* AcquireCacheView(const(Image)*);
+	CacheView* CloneCacheView(const(CacheView)*);
+	CacheView* DestroyCacheView(CacheView*);
+
 	ClassType GetCacheViewStorageClass(const(CacheView)*);
 
 	ColorspaceType GetCacheViewColorspace(const(CacheView)*);
@@ -56,11 +60,9 @@ extern(C)
 
 	MagickSizeType GetCacheViewExtent(const(CacheView)*);
 
+	size_t GetCacheViewChannels(const(CacheView)*);
+
 	PixelPacket* GetCacheViewAuthenticPixelQueue(CacheView*);
 	PixelPacket* GetCacheViewAuthenticPixels(CacheView*, const ssize_t, const ssize_t, const size_t, const size_t, ExceptionInfo*);
 	PixelPacket* QueueCacheViewAuthenticPixels(CacheView*, const ssize_t, const ssize_t, const size_t, const size_t, ExceptionInfo*);
-
-	CacheView* AcquireCacheView(const(Image)*);
-	CacheView* CloneCacheView(const(CacheView)*);
-	CacheView* DestroyCacheView(CacheView*);
 }
diff --git a/dmagick/c/composite.d b/dmagick/c/composite.d
index 1e462cb..e06c48c 100644
--- a/dmagick/c/composite.d
+++ b/dmagick/c/composite.d
@@ -80,6 +80,8 @@ extern(C)
 		MathematicsCompositeOp,
 		DivideSrcCompositeOp,
 		MinusSrcCompositeOp,
+		DarkenIntensityCompositeOp,
+		LightenIntensityCompositeOp,
 
 		/* Depreciated (renamed) Method Names for backward compatibility */
 		AddCompositeOp      = ModulusAddCompositeOp,
diff --git a/dmagick/c/compress.d b/dmagick/c/compress.d
index 58003c8..40b1446 100644
--- a/dmagick/c/compress.d
+++ b/dmagick/c/compress.d
@@ -16,7 +16,7 @@ extern(C)
 		FaxCompression,
 		Group4Compression,
 		JPEGCompression,
-		JPEG2000Compression,
+		JPEG2000Compression,     /* ISO/IEC std 15444-1 */
 		LosslessJPEGCompression,
 		LZWCompression,
 		RLECompression,
@@ -25,7 +25,10 @@ extern(C)
 		PizCompression,
 		Pxr24Compression,
 		B44Compression,
-		B44ACompression
+		B44ACompression,
+		LZMACompression,         /* Lempel-Ziv-Markov chain algorithm */
+		JBIG1Compression,        /* ISO/IEC std 11544 / ITU-T rec T.82 */
+		JBIG2Compression         /* ISO/IEC std 14492 / ITU-T rec T.88 */
 	}
 
 	struct Ascii85Info {}
diff --git a/dmagick/c/deprecate.d b/dmagick/c/deprecate.d
index 1c9df78..69c54a5 100644
--- a/dmagick/c/deprecate.d
+++ b/dmagick/c/deprecate.d
@@ -94,6 +94,8 @@ deprecated extern(C)
 	int GetImageGeometry(Image*, const(char)*, const uint, RectangleInfo*);
 	int ParseImageGeometry(const(char)*, ssize_t*, ssize_t*, size_t*, size_t*);
 
+	ssize_t FormatMagickString(char*, const size_t, const(char)*, ...);
+	ssize_t FormatMagickStringList(char*, const size_t, const(char)*, va_list);
 	ssize_t GetImageListIndex(const(Image)*);
 	ssize_t SetMagickRegistry(const RegistryType, const(void)*, const size_t, ExceptionInfo*);
 
diff --git a/dmagick/c/distort.d b/dmagick/c/distort.d
index 4c15839..ff406e4 100644
--- a/dmagick/c/distort.d
+++ b/dmagick/c/distort.d
@@ -24,6 +24,7 @@ extern(C)
 		BarrelDistortion,
 		BarrelInverseDistortion,
 		ShepardsDistortion,
+		ResizeDistortion,
 		SentinelDistortion
 	}
 
@@ -35,9 +36,11 @@ extern(C)
 		PolynomialColorInterpolate =  DistortImageMethod.PolynomialDistortion,
 		ShepardsColorInterpolate =    DistortImageMethod.ShepardsDistortion,
 
-		VoronoiColorInterpolate =     DistortImageMethod.SentinelDistortion
+		VoronoiColorInterpolate =     DistortImageMethod.SentinelDistortion,
+		InverseColorInterpolate
 	}
 
 	Image* DistortImage(const(Image)*, const DistortImageMethod, const size_t, const(double)*, MagickBooleanType, ExceptionInfo* exception);
+	Image* DistortResizeImage(const(Image)*, const size_t, const size_t, ExceptionInfo*);
 	Image* SparseColorImage(const(Image)*, const ChannelType, const SparseColorMethod, const size_t, const(double)*, ExceptionInfo*);
 }
diff --git a/dmagick/c/effect.d b/dmagick/c/effect.d
index 812ef64..2edebe9 100644
--- a/dmagick/c/effect.d
+++ b/dmagick/c/effect.d
@@ -44,12 +44,14 @@ extern(C)
 	enum StatisticType
 	{
 		UndefinedStatistic,
+		GradientStatistic,
 		MaximumStatistic,
 		MeanStatistic,
 		MedianStatistic,
 		MinimumStatistic,
 		ModeStatistic,
-		NonpeakStatistic
+		NonpeakStatistic,
+		StandardDeviationStatistic
 	}
 
 	Image* AdaptiveBlurImage(const(Image)*, const double, const double, ExceptionInfo*);
diff --git a/dmagick/c/image.d b/dmagick/c/image.d
index ae6fba1..9948841 100644
--- a/dmagick/c/image.d
+++ b/dmagick/c/image.d
@@ -319,6 +319,9 @@ extern(C)
 
 		MagickBooleanType
 			ping;
+
+		size_t
+			channels;
 	}
 
 	struct ImageInfo
@@ -503,6 +506,7 @@ extern(C)
 	MagickBooleanType SetImageInfo(ImageInfo*, const uint, ExceptionInfo*);
 	MagickBooleanType SetImageMask(Image*, const(Image)*);
 	MagickBooleanType SetImageOpacity(Image*, const Quantum);
+	MagickBooleanType SetImageChannels(Image*, const size_t);
 	MagickBooleanType SetImageStorageClass(Image*, const ClassType);
 	MagickBooleanType SetImageType(Image*, const ImageType);
 	MagickBooleanType StripImage(Image*);
@@ -514,6 +518,8 @@ extern(C)
 
 	ssize_t GetImageReferenceCount(Image*);
 
+	size_t GetImageChannels(Image*);
+
 	VirtualPixelMethod GetImageVirtualPixelMethod(const(Image)*);
 	VirtualPixelMethod SetImageVirtualPixelMethod(const(Image)*, const VirtualPixelMethod);
 
diff --git a/dmagick/c/locale.d b/dmagick/c/locale.d
index 6fe476f..e302f92 100644
--- a/dmagick/c/locale.d
+++ b/dmagick/c/locale.d
@@ -1,6 +1,8 @@
 module dmagick.c.locale;
 
 import core.stdc.stdio;
+import core.sys.posix.sys.types;
+import core.vararg;
 
 import dmagick.c.exception;
 import dmagick.c.hashmap;
@@ -33,11 +35,18 @@ extern(C)
 	const(LocaleInfo)*  GetLocaleInfo_(const(char)*, ExceptionInfo*);
 	const(LocaleInfo)** GetLocaleInfoList(const(char)*, size_t*, ExceptionInfo*);
 
+	double InterpretLocaleValue(const(char)*, char**);
+
 	LinkedListInfo* DestroyLocaleOptions(LinkedListInfo*);
 	LinkedListInfo* GetLocaleOptions(const(char)*, ExceptionInfo*);
 
 	MagickBooleanType ListLocaleInfo(FILE*, ExceptionInfo*);
 	MagickBooleanType LocaleComponentGenesis();
 
+	ssize_t FormatLocaleFile(FILE*, const(char)*, ...);
+	ssize_t FormatLocaleFileList(FILE*, const(char)*, va_list);
+	ssize_t FormatLocaleString(char*, const size_t, const(char)*, ...);
+	ssize_t FormatLocaleStringList(char*, const size_t, const(char)*, va_list);
+
 	void LocaleComponentTerminus();
 }
diff --git a/dmagick/c/magickString.d b/dmagick/c/magickString.d
index 8ebac5a..8c5f939 100644
--- a/dmagick/c/magickString.d
+++ b/dmagick/c/magickString.d
@@ -3,7 +3,6 @@ module dmagick.c.magickString;
 import core.stdc.stdio;
 import core.stdc.time;
 import core.sys.posix.sys.types;
-import core.vararg;
 
 import dmagick.c.exception;
 import dmagick.c.magickType;
@@ -51,8 +50,6 @@ extern(C)
 	size_t GetStringInfoLength(const(StringInfo)*);
 
 	ssize_t	FormatMagickSize(const MagickSizeType, const MagickBooleanType, char*);
-	ssize_t	FormatMagickString(char*, const size_t, const(char)*, ...);
-	ssize_t	FormatMagickStringList(char*, const size_t, const(char)*, va_list);
 	ssize_t	FormatMagickTime(const time_t, const size_t, char*);
 
 	StringInfo* AcquireStringInfo(const size_t);
diff --git a/dmagick/c/magickType.d b/dmagick/c/magickType.d
index 879e6aa..be49e7d 100644
--- a/dmagick/c/magickType.d
+++ b/dmagick/c/magickType.d
@@ -66,25 +66,26 @@ extern (C)
 	enum ChannelType
 	{
 		UndefinedChannel,
-		RedChannel     = 0x0001,
-		GrayChannel    = 0x0001,
-		CyanChannel    = 0x0001,
-		GreenChannel   = 0x0002,
-		MagentaChannel = 0x0002,
-		BlueChannel    = 0x0004,
-		YellowChannel  = 0x0004,
-		AlphaChannel   = 0x0008,
-		OpacityChannel = 0x0008,
-		MatteChannel   = 0x0008,  // deprecated
-		BlackChannel   = 0x0020,
-		IndexChannel   = 0x0020,
-		AllChannels    = 0x002F,
+		RedChannel        = 0x0001,
+		GrayChannel       = 0x0001,
+		CyanChannel       = 0x0001,
+		GreenChannel      = 0x0002,
+		MagentaChannel    = 0x0002,
+		BlueChannel       = 0x0004,
+		YellowChannel     = 0x0004,
+		AlphaChannel      = 0x0008,
+		OpacityChannel    = 0x0008,
+		MatteChannel      = 0x0008,  // deprecated
+		BlackChannel      = 0x0020,
+		IndexChannel      = 0x0020,
+		CompositeChannels = 0x002F,
+		AllChannels       =   ~0UL,
 
 		TrueAlphaChannel = 0x0040, // extract actual alpha channel from opacity
 		RGBChannels      = 0x0080, // set alpha from  grayscale mask in RGB
 		GrayChannels     = 0x0080,
 		SyncChannels     = 0x0100, // channels should be modified equally
-		DefaultChannels  = 0x0127  //( (AllChannels | SyncChannels) &~ OpacityChannel)
+		DefaultChannels  = ( (AllChannels | SyncChannels) &~ OpacityChannel)
 	}
 
 	enum ClassType
diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d
index 3172ac7..bded7db 100644
--- a/dmagick/c/magickVersion.d
+++ b/dmagick/c/magickVersion.d
@@ -3,9 +3,9 @@ module dmagick.c.magickVersion;
 extern(C)
 {
 	/// Defines the version of ImageMagick where these headers are based on.
-	enum MagickLibVersion = 0x669;
+	enum MagickLibVersion = 0x670;
 	///ditto
-	enum MagickLibVersionText = "6.6.9"; 
+	enum MagickLibVersionText = "6.7.0"; 
 
 	char* GetMagickHomeURL();
 
diff --git a/dmagick/c/morphology.d b/dmagick/c/morphology.d
index 2478387..3abc668 100644
--- a/dmagick/c/morphology.d
+++ b/dmagick/c/morphology.d
@@ -11,28 +11,29 @@ extern(C)
 {
 	enum KernelInfoType
 	{
-		UndefinedKernel,
-		UnityKernel,
-		GaussianKernel,
+		UndefinedKernel,    /* equivelent to UnityKernel */
+		UnityKernel,        /* The no-op or 'original image' kernel */
+		GaussianKernel,     /* Convolution Kernels, Gaussian Based */
 		DoGKernel,
 		LoGKernel,
 		BlurKernel,
 		CometKernel,
-		LaplacianKernel,
+		LaplacianKernel,    /* Convolution Kernels, by Name */
 		SobelKernel,
 		FreiChenKernel,
 		RobertsKernel,
 		PrewittKernel,
 		CompassKernel,
 		KirschKernel,
-		DiamondKernel,
+		DiamondKernel,      /* Shape Kernels */
 		SquareKernel,
 		RectangleKernel,
+		OctagonKernel,
 		DiskKernel,
 		PlusKernel,
 		CrossKernel,
 		RingKernel,
-		PeaksKernel,
+		PeaksKernel,        /* Hit And Miss Kernels */
 		EdgesKernel,
 		CornersKernel,
 		ThinDiagonalsKernel,
@@ -41,40 +42,48 @@ extern(C)
 		RidgesKernel,
 		ConvexHullKernel,
 		SkeletonKernel,
-		ChebyshevKernel,
+		ChebyshevKernel,    /* Distance Measuring Kernels */
 		ManhattanKernel,
 		EuclideanKernel,
-		UserDefinedKernel
+		UserDefinedKernel   /* User Specified Kernel Array */
 	}
 
 	enum MorphologyMethod
 	{
 		UndefinedMorphology,
 
-		ConvolveMorphology,
-		CorrelateMorphology,
-
-		ErodeMorphology,
-		DilateMorphology,
-		ErodeIntensityMorphology,
-		DilateIntensityMorphology,
-		DistanceMorphology,
-
-		OpenMorphology,
-		CloseMorphology,
-		OpenIntensityMorphology,
-		CloseIntensityMorphology,
-		SmoothMorphology,
-
-		EdgeInMorphology,
-		EdgeOutMorphology,
-		EdgeMorphology,
-		TopHatMorphology,
-		BottomHatMorphology,
-
-		HitAndMissMorphology,
-		ThinningMorphology,
-		ThickenMorphology
+		/* Convolve / Correlate weighted sums */
+		ConvolveMorphology,          /* Weighted Sum with reflected kernel */
+		CorrelateMorphology,         /* Weighted Sum using a sliding window */
+
+		/* Low-level Morphology methods */
+		ErodeMorphology,             /* Minimum Value in Neighbourhood */
+		DilateMorphology,            /* Maximum Value in Neighbourhood */
+		ErodeIntensityMorphology,    /* Pixel Pick using GreyScale Erode */
+		DilateIntensityMorphology,   /* Pixel Pick using GreyScale Dialate */
+		DistanceMorphology,          /* Add Kernel Value, take Minimum */
+
+		/* Second-level Morphology methods */
+		OpenMorphology,              /* Dilate then Erode */
+		CloseMorphology,             /* Erode then Dilate */
+		OpenIntensityMorphology,     /* Pixel Pick using GreyScale Open */
+		CloseIntensityMorphology,    /* Pixel Pick using GreyScale Close */
+		SmoothMorphology,            /* Open then Close */
+
+		/* Difference Morphology methods */
+		EdgeInMorphology,            /* Dilate difference from Original */
+		EdgeOutMorphology,           /* Erode difference from Original */
+		EdgeMorphology,              /* Dilate difference with Erode */
+		TopHatMorphology,            /* Close difference from Original */
+		BottomHatMorphology,         /* Open difference from Original */
+
+		/* Recursive Morphology methods */
+		HitAndMissMorphology,        /* Foreground/Background pattern matching */
+		ThinningMorphology,          /* Remove matching pixels from image */
+		ThickenMorphology,           /* Add matching pixels from image */
+
+		/* Experimental Morphology methods */
+		VoronoiMorphology
 	}
 
 	struct KernelInfo
diff --git a/dmagick/c/option.d b/dmagick/c/option.d
index 3edbad9..915796a 100644
--- a/dmagick/c/option.d
+++ b/dmagick/c/option.d
@@ -9,7 +9,7 @@ import dmagick.c.magickType;
 
 extern(C)
 {
-	enum MagickOption
+	enum CommandOption
 	{
 		MagickUndefinedOptions = -1,
 		MagickAlignOptions = 0,
@@ -42,7 +42,6 @@ extern(C)
 		MagickFormatOptions,
 		MagickFunctionOptions,
 		MagickGravityOptions,
-		MagickImageListOptions,
 		MagickIntentOptions,
 		MagickInterlaceOptions,
 		MagickInterpolateOptions,
@@ -98,34 +97,52 @@ extern(C)
 		AllValidate = 0x7fffffff
 	}
 
+	enum CommandOptionFlags
+	{
+		UndefinedOptionFlag       = 0x0000,
+		FireOptionFlag            = 0x0001,  /* Option sequence firing point */
+		ImageInfoOptionFlag       = 0x0002,  /* Sets ImageInfo, no image needed */
+		DrawInfoOptionFlag        = 0x0004,  /* Sets DrawInfo, no image needed */
+		QuantizeInfoOptionFlag    = 0x0008,  /* Sets QuantizeInfo, no image needed */
+		GlobalOptionFlag          = 0x0010,  /* Sets Global Option, no image needed */
+		SimpleOperatorOptionFlag  = 0x0100,  /* Simple Image processing operator */
+		ListOperatorOptionFlag    = 0x0200,  /* Multi-Image List processing operator */
+		SpecialOperatorOptionFlag = 0x0400,  /* Specially handled Operator Option */
+		GenesisOptionFlag         = 0x0400,  /* Genesis Command Wrapper Option  */
+		NonConvertOptionFlag      = 0x4000,  /* Option not used by Convert */
+		DeprecateOptionFlag       = 0x8000   /* Deprecate option, give warning */
+	}
+
 	struct OptionInfo
 	{
 		const(char)*
 			mnemonic;
 
 		ssize_t
-			type;
+			type,
+			flags;
 
 		MagickBooleanType
 			stealth;
 	}
 
-	char** GetMagickOptions(const MagickOption);
+	char** GetCommandOptions(const CommandOption);
 	char*  GetNextImageOption(const(ImageInfo)*);
 	char*  RemoveImageOption(ImageInfo*, const(char)*);
 
+	const(char)* CommandOptionToMnemonic(const CommandOption, const ssize_t);
 	const(char)* GetImageOption(const(ImageInfo)*, const(char)*);
-	const(char)* MagickOptionToMnemonic(const MagickOption, const ssize_t);
 
 	MagickBooleanType CloneImageOptions(ImageInfo*, const(ImageInfo)*);
 	MagickBooleanType DefineImageOption(ImageInfo*, const(char)*);
 	MagickBooleanType DeleteImageOption(ImageInfo*, const(char)*);
-	MagickBooleanType IsMagickOption(const(char)*);
-	MagickBooleanType ListMagickOptions(FILE*, const MagickOption, ExceptionInfo*);
+	MagickBooleanType IsCommandOption(const(char)*);
+	MagickBooleanType ListCommandOptions(FILE*, const CommandOption, ExceptionInfo*);
 	MagickBooleanType SetImageOption(ImageInfo*, const(char)*, const(char)*);
 
+	ssize_t GetCommandOptionFlags(const CommandOption, const MagickBooleanType, const(char)*);
 	ssize_t ParseChannelOption(const(char)*);
-	ssize_t ParseMagickOption(const MagickOption, const MagickBooleanType,const(char)*);
+	ssize_t ParseCommandOption(const CommandOption, const MagickBooleanType, const(char)*);
 
 	void DestroyImageOptions(ImageInfo*);
 	void ResetImageOptions(const(ImageInfo)*);
diff --git a/dmagick/c/pixel.d b/dmagick/c/pixel.d
index dda5575..982c90d 100644
--- a/dmagick/c/pixel.d
+++ b/dmagick/c/pixel.d
@@ -24,6 +24,24 @@ extern(C)
 		SplineInterpolatePixel
 	}
 
+	enum PixelComponent
+	{
+		RedPixelComponent = 0,
+		CyanPixelComponent = 0,
+		GrayPixelComponent = 0,
+		YPixelComponent = 0,
+		GreenPixelComponent = 1,
+		MagentaPixelComponent = 1,
+		CbPixelComponent = 1,
+		BluePixelComponent = 2,
+		YellowPixelComponent = 2,
+		CrPixelComponent = 2,
+		AlphaPixelComponent = 3,
+		BlackPixelComponent = 4,
+		IndexPixelComponent = 4,
+		MaskPixelComponent = 5
+	}
+
 	struct DoublePixelPacket
 	{
 		double
diff --git a/dmagick/c/property.d b/dmagick/c/property.d
index e3fdfb0..90ffd9f 100644
--- a/dmagick/c/property.d
+++ b/dmagick/c/property.d
@@ -1,7 +1,5 @@
 module dmagick.c.property;
 
-import core.vararg;
-
 import dmagick.c.image;
 import dmagick.c.magickType;
 
@@ -18,7 +16,6 @@ extern(C)
 	MagickBooleanType DefineImageProperty(Image*, const(char)*);
 	MagickBooleanType DeleteImageProperty(Image*, const(char)*);
 	MagickBooleanType FormatImageProperty(Image*, const(char)*, const(char)*, ...);
-	MagickBooleanType FormatImagePropertyList(Image*, const(char)*, const(char)*, va_list);
 	MagickBooleanType SetImageProperty(Image*, const(char)*, const(char)*);
 
 	void DestroyImageProperties(Image*);