Update headers to version 6.6.9ImageMagick_6.6.9

11 files changed, 95 insertions, 63 deletions

diff --git a/dmagick/Image.d b/dmagick/Image.d
index 3062658..a08abeb 100644
--- a/dmagick/Image.d
+++ b/dmagick/Image.d
@@ -1746,11 +1746,11 @@ class Image
 	 *              longer than you want to wait, and will not have
 	 *              significantly better results than much smaller values.
 	 */
-	void medianFilter(double radius = 0)
+	//TODO: replace this with a statistic function?
+	void medianFilter(size_t radius = 0)
 	{
-		//TODO: Recently deprecated use StatisticImage. (Update the headers first)
 		MagickCoreImage* image = 
-			MedianFilterImage(imageRef, radius, DMagickExceptionInfo());
+			StatisticImage(imageRef, StatisticType.MedianStatistic, radius, radius, DMagickExceptionInfo());
 
 		imageRef = ImageRef(image);
 	}
diff --git a/dmagick/c/composite.d b/dmagick/c/composite.d
index a1c8c6c..1e462cb 100644
--- a/dmagick/c/composite.d
+++ b/dmagick/c/composite.d
@@ -45,7 +45,7 @@ extern(C)
 		LightenCompositeOp,
 		LinearLightCompositeOp,
 		LuminizeCompositeOp,
-		MinusCompositeOp,
+		MinusDstCompositeOp,
 		ModulateCompositeOp,
 		MultiplyCompositeOp,
 		OutCompositeOp,
@@ -64,7 +64,12 @@ extern(C)
 		ModulusSubtractCompositeOp,
 		ThresholdCompositeOp,
 		XorCompositeOp,
-		DivideCompositeOp,
+		/*
+		 * These are new operators, added after the above was last sorted.
+		 * The list should be re-sorted only when a new library version is
+		 * created.
+		 */
+		DivideDstCompositeOp,
 		DistortCompositeOp,
 		BlurCompositeOp,
 		PegtopLightCompositeOp,
@@ -72,7 +77,15 @@ extern(C)
 		PinLightCompositeOp,
 		LinearDodgeCompositeOp,
 		LinearBurnCompositeOp,
-		MathematicsCompositeOp
+		MathematicsCompositeOp,
+		DivideSrcCompositeOp,
+		MinusSrcCompositeOp,
+
+		/* Depreciated (renamed) Method Names for backward compatibility */
+		AddCompositeOp      = ModulusAddCompositeOp,
+		SubtractCompositeOp = ModulusSubtractCompositeOp,
+		MinusCompositeOp    = MinusDstCompositeOp,
+		DivideCompositeOp   = DivideDstCompositeOp		
 	}
 
 	MagickBooleanType CompositeImage(Image*, const CompositeOperator, const(Image)*, const ssize_t, const ssize_t);
diff --git a/dmagick/c/deprecate.d b/dmagick/c/deprecate.d
index 3700483..1c9df78 100644
--- a/dmagick/c/deprecate.d
+++ b/dmagick/c/deprecate.d
@@ -76,10 +76,13 @@ deprecated extern(C)
 	Image* GetPreviousImage(const(Image)*);
 	Image* FlattenImages(Image*, ExceptionInfo*);
 	Image* MaximumImages(const(Image)*, ExceptionInfo*);
+	Image* MedianFilterImage(const Image*, const double, ExceptionInfo*);
+	Image* ModeImage(const(Image)*, const double, ExceptionInfo*);
 	Image* MinimumImages(const(Image)*, ExceptionInfo*);
 	Image* MosaicImages(Image*, ExceptionInfo*);
 	Image* PopImageList(Image**);
 	Image* RecolorImage(const(Image)*, const size_t, const(double)*, ExceptionInfo*);
+	Image* ReduceNoiseImage(const(Image)*, const double, ExceptionInfo*);
 	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*);
diff --git a/dmagick/c/effect.d b/dmagick/c/effect.d
index f0a2484..812ef64 100644
--- a/dmagick/c/effect.d
+++ b/dmagick/c/effect.d
@@ -41,6 +41,17 @@ extern(C)
 		JPEGPreview
 	}
 
+	enum StatisticType
+	{
+		UndefinedStatistic,
+		MaximumStatistic,
+		MeanStatistic,
+		MedianStatistic,
+		MinimumStatistic,
+		ModeStatistic,
+		NonpeakStatistic
+	}
+
 	Image* AdaptiveBlurImage(const(Image)*, const double, const double, ExceptionInfo*);
 	Image* AdaptiveBlurImageChannel(const(Image)*, const ChannelType, const double, const double, ExceptionInfo*);
 	Image* AdaptiveSharpenImage(const(Image)*, const double, const double, ExceptionInfo*);
@@ -56,20 +67,19 @@ extern(C)
 	Image* FilterImageChannel(const(Image)*, const ChannelType, const(KernelInfo)*, ExceptionInfo*);
 	Image* GaussianBlurImage(const(Image)*, const double, const double, ExceptionInfo*);
 	Image* GaussianBlurImageChannel(const(Image)*, const ChannelType, const double, const double, ExceptionInfo*);
-	Image* MedianFilterImage(const(Image)*, const double, ExceptionInfo*);
-	Image* ModeImage(const(Image)*, const double, ExceptionInfo*);
 	Image* MotionBlurImage(const(Image)*, const double, const double, const double, ExceptionInfo*);
 	Image* MotionBlurImageChannel(const(Image)*, const ChannelType, const double, const double, const double, ExceptionInfo*);
 	Image* PreviewImage(const(Image)*, const PreviewType, ExceptionInfo*);
 	Image* RadialBlurImage(const(Image)*, const double, ExceptionInfo*);
 	Image* RadialBlurImageChannel(const(Image)*, const ChannelType, const double, ExceptionInfo*);
-	Image* ReduceNoiseImage(const(Image)*, const double, ExceptionInfo*);
 	Image* SelectiveBlurImage(const(Image)*, const double, const double, const double, ExceptionInfo*);
 	Image* SelectiveBlurImageChannel(const(Image)*, const ChannelType, const double, const double, const double, ExceptionInfo*);
 	Image* ShadeImage(const(Image)*, const MagickBooleanType, const double, const double, ExceptionInfo*);
 	Image* SharpenImage(const(Image)*, const double, const double, ExceptionInfo*);
 	Image* SharpenImageChannel(const(Image)*, const ChannelType ,const double, const double, ExceptionInfo*);
 	Image* SpreadImage(const(Image)*, const double, ExceptionInfo*);
+	Image* StatisticImage(const(Image)*, const StatisticType, const size_t, const size_t, ExceptionInfo*);
+	Image* StatisticImageChannel(const(Image)*, const ChannelType, const StatisticType, const size_t, const size_t, ExceptionInfo*);
 	Image* UnsharpMaskImage(const(Image)*, const double, const double, const double, const double, ExceptionInfo*);
 	Image* UnsharpMaskImageChannel(const(Image)*, const ChannelType, const double, const double, const double, const double, ExceptionInfo*);
 }
diff --git a/dmagick/c/image.d b/dmagick/c/image.d
index 414ebb1..ae6fba1 100644
--- a/dmagick/c/image.d
+++ b/dmagick/c/image.d
@@ -129,34 +129,34 @@ extern(C)
 			storage_class;
 
 		ColorspaceType
-			colorspace;
+			colorspace;      /* colorspace of image data */
 
 		CompressionType
-			compression;
+			compression;     /* compression of image when read/write */
 
 		size_t
-			quality;
+			quality;         /* compression quality setting, meaning varies */
 
 		OrientationType
-			orientation;
+			orientation;     /* photo orientation of image */
 
 		MagickBooleanType
-			taint,
-			matte;
+			taint,           /* has image been modified since reading */
+			matte;           /* is transparency channel defined and active */
 
 		size_t
-			columns,
+			columns,         /* physical size of image */
 			rows,
-			depth,
-			colors;
+			depth,           /* depth of image on read/write */
+			colors;          /* size of color table on read */
 
 		PixelPacket*
 			colormap;
 
 		PixelPacket
-			background_color,
-			border_color,
-			matte_color;
+			background_color, /* current background color attribute */
+			border_color,     /* current bordercolor attribute */
+			matte_color;      /* current mattecolor attribute */
 
 		double
 			gamma;
@@ -171,7 +171,7 @@ extern(C)
 			profiles;
 
 		ResolutionType
-			units;
+			units;           /* resolution/density  ppi or ppc */
 
 		char*
 			montage,
@@ -182,46 +182,46 @@ extern(C)
 			offset;
 
 		double
-			x_resolution,
+			x_resolution,    /* image resolution/density */
 			y_resolution;
 
 		RectangleInfo
-			page,
+			page,            /* virtual canvas size and offset of image */
 			extract_info,
-			tile_info;
+			tile_info;       /* deprecated */
 
 		double
 			bias,
-			blur,
-			fuzz;
+			blur,            /* deprecated */
+			fuzz;            /* current color fuzz attribute */
 
 		FilterTypes
-			filter;
+			filter;          /* resize/distort filter to apply */
 
 		InterlaceType
 			interlace;
 
 		EndianType
-			endian;
+			endian;          /* raw data integer ordering on read/write */
 
 		GravityType
-			gravity;
+			gravity;         /* Gravity attribute for positioning in image */
 
 		CompositeOperator
-			compose;
+			compose;         /* alpha composition method for layered images */
 
 		DisposeType
-			dispose;
+			dispose;         /* GIF animation disposal method */
 
 		Image*
 			clip_mask;
 
 		size_t
-			scene,
-			delay;
+			scene,           /* index of image in multi-image file */
+			delay;           /* Animation delay time */
 
 		ssize_t
-			ticks_per_second;
+			ticks_per_second;  /* units for delay time, default 100 for GIF */
 
 		size_t
 			iterations,
@@ -242,7 +242,7 @@ extern(C)
 		void*
 			client_data,
 			cache,
-			attributes;
+			attributes;      /* deprecated */
 
 		Ascii85Info*
 			ascii85;
@@ -251,7 +251,7 @@ extern(C)
 			blob;
 
 		char[MaxTextExtent]
-			filename,
+			filename,        /* images input filename */
 			magick_filename,
 			magick;
 
@@ -260,10 +260,10 @@ extern(C)
 			magick_rows;
 
 		ExceptionInfo
-			exception;
+			exception;       /* Error handling report */
 
 		MagickBooleanType
-			ddebug;
+			ddebug;          /* debug output attribute */
 
 		ssize_t
 			reference_count;
@@ -285,18 +285,18 @@ extern(C)
 			signature;
 
 		Image*
-			previous,
+			previous,        /* Image sequence list links */
 			list,
 			next;
 
 		InterpolatePixelMethod
-			interpolate;
+			interpolate;     /* Interpolation of color for between pixel lookups */
 
 		MagickBooleanType
 			black_point_compensation;
 
 		PixelPacket
-			transparent_color;
+			transparent_color; /* color for 'transparent' color index in GIF */
 
 		Image*
 			mask;
@@ -305,14 +305,14 @@ extern(C)
 			tile_offset;
 
 		void*
-			properties,
-			artifacts;
+			properties,      /* per image properities */
+			artifacts;       /* per image sequence image artifacts */
 
 		ImageType
 			type;
 
 		MagickBooleanType
-			dither;
+			dither;          /* dithering method during color reduction */
 
 		MagickSizeType
 			extent;
diff --git a/dmagick/c/list.d b/dmagick/c/list.d
index 0f705e4..81eb69b 100644
--- a/dmagick/c/list.d
+++ b/dmagick/c/list.d
@@ -10,6 +10,7 @@ extern(C)
 	Image*  CloneImageList(const(Image)*, ExceptionInfo*);
 	Image*  CloneImages(const(Image)*, const(char)*, ExceptionInfo*);
 	Image*  DestroyImageList(Image*);
+	Image*  DuplicateImages(Image*, const size_t, const char*, ExceptionInfo*);
 	Image*  GetFirstImageInList(const(Image)*);
 	Image*  GetImageFromList(const(Image)*, const ssize_t);
 	Image*  GetLastImageInList(const(Image)*);
@@ -34,6 +35,7 @@ extern(C)
 	void InsertImageInList(Image**, Image*);
 	void PrependImageToList(Image**, Image*);
 	void ReplaceImageInList(Image**, Image*);
+	void ReplaceImageInListReturnLast(Image**, Image*);
 	void ReverseImageList(Image**);
 	void SyncImageList(Image*);
 }
diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d
index b506e62..3172ac7 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 = 0x668;
+	enum MagickLibVersion = 0x669;
 	///ditto
-	enum MagickLibVersionText = "6.6.8"; 
+	enum MagickLibVersionText = "6.6.9"; 
 
 	char* GetMagickHomeURL();
 
diff --git a/dmagick/c/option.d b/dmagick/c/option.d
index 159a5c4..3edbad9 100644
--- a/dmagick/c/option.d
+++ b/dmagick/c/option.d
@@ -72,6 +72,7 @@ extern(C)
 		MagickResolutionOptions,
 		MagickResourceOptions,
 		MagickSparseColorOptions,
+		MagickStatisticOptions,
 		MagickStorageOptions,
 		MagickStretchOptions,
 		MagickStyleOptions,
diff --git a/dmagick/c/pixel.d b/dmagick/c/pixel.d
index ee8dc8f..dda5575 100644
--- a/dmagick/c/pixel.d
+++ b/dmagick/c/pixel.d
@@ -2,14 +2,28 @@ module dmagick.c.pixel;
 
 import core.sys.posix.sys.types;
 
-import dmagick.c.magickType;
+import dmagick.c.cacheView;
 import dmagick.c.colorspace;
+import dmagick.c.constitute;
 import dmagick.c.exception;
 import dmagick.c.image;
-import dmagick.c.constitute;
+import dmagick.c.magickType;
 
 extern(C)
 {
+	enum InterpolatePixelMethod
+	{
+		UndefinedInterpolatePixel,
+		AverageInterpolatePixel,
+		BicubicInterpolatePixel,
+		BilinearInterpolatePixel,
+		FilterInterpolatePixel,
+		IntegerInterpolatePixel,
+		MeshInterpolatePixel,
+		NearestNeighborInterpolatePixel,
+		SplineInterpolatePixel
+	}
+
 	struct DoublePixelPacket
 	{
 		double
@@ -69,6 +83,7 @@ extern(C)
 
 	MagickBooleanType ExportImagePixels(const(Image)*, const ssize_t, const ssize_t, const size_t, const size_t, const(char)*, const StorageType, void*, ExceptionInfo*);
 	MagickBooleanType ImportImagePixels(Image*, const ssize_t, const ssize_t, const size_t, const size_t, const(char)*, const StorageType, const(void)*);
+	MagickBooleanType InterpolateMagickPixelPacket(const Image*, const CacheView*, const InterpolatePixelMethod, const double, const double, MagickPixelPacket*, ExceptionInfo*);
 
 	void GetMagickPixelPacket(const(Image)*, MagickPixelPacket*);
 }
diff --git a/dmagick/c/resample.d b/dmagick/c/resample.d
index 7a0cb0b..455f119 100644
--- a/dmagick/c/resample.d
+++ b/dmagick/c/resample.d
@@ -1,10 +1,10 @@
 module dmagick.c.resample;
 
+import dmagick.c.cacheView;
 import dmagick.c.exception;
 import dmagick.c.image;
 import dmagick.c.magickType;
 import dmagick.c.pixel;
-import dmagick.c.cacheView;
 
 extern(C)
 {
@@ -38,19 +38,6 @@ extern(C)
 		SentinelFilter
 	}
 
-	enum InterpolatePixelMethod
-	{
-		UndefinedInterpolatePixel,
-		AverageInterpolatePixel,
-		BicubicInterpolatePixel,
-		BilinearInterpolatePixel,
-		FilterInterpolatePixel,
-		IntegerInterpolatePixel,
-		MeshInterpolatePixel,
-		NearestNeighborInterpolatePixel,
-		SplineInterpolatePixel
-	}
-
 	struct ResampleFilter {}
 
 	MagickBooleanType ResamplePixelColor(ResampleFilter*, const double, const double, MagickPixelPacket*);
diff --git a/dmagick/c/transform.d b/dmagick/c/transform.d
index ff99106..fd7ab12 100644
--- a/dmagick/c/transform.d
+++ b/dmagick/c/transform.d
@@ -12,6 +12,7 @@ extern(C)
 	Image* ChopImage(const(Image)*, const(RectangleInfo)*, ExceptionInfo*);
 	Image* ConsolidateCMYKImages(const(Image)*, ExceptionInfo*);
 	Image* CropImage(const(Image)*, const(RectangleInfo)*, ExceptionInfo*);
+	Image* CropImageToTiles(const(Image)*, const(char)*, ExceptionInfo*);
 	Image* ExcerptImage(const(Image)*, const(RectangleInfo)*, ExceptionInfo*);
 	Image* ExtentImage(const(Image)*, const(RectangleInfo)*, ExceptionInfo*);
 	Image* FlipImage(const(Image)*, ExceptionInfo*);