Update the headers for ImageMagick 6.7.8.

MikeWey · Jul 8, 2012 · 5715217 · 5715217
1 parent 53ce20f
commit 5715217
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 17 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -49,7 +49,7 @@ ifneq ("$(QUANTUMDEPTH)","Q16")
     VERSIONS+= -version=$(subst Q,Quantum,$(QUANTUMDEPTH))
 endif
 
-ifneq ("$(MAGICKVERSION)","677")
+ifneq ("$(MAGICKVERSION)","678")
     VERSIONS+= -version=MagickCore_$(MAGICKVERSION)
 endif
 

diff --git a/dmagick/c/MagickCore.d b/dmagick/c/MagickCore.d
@@ -8,6 +8,7 @@ public import dmagick.c.attribute;
 public import dmagick.c.blob;
 public import dmagick.c.cache;
 public import dmagick.c.cacheView;
+public import dmagick.c.channel;
 public import dmagick.c.cipher;
 public import dmagick.c.client;
 public import dmagick.c.coder;

diff --git a/dmagick/c/attribute.d b/dmagick/c/attribute.d
@@ -14,6 +14,7 @@ extern(C)
 	MagickBooleanType IsOpaqueImage(const(Image)*, ExceptionInfo*);
 	MagickBooleanType SetImageChannelDepth(Image*, const ChannelType, const size_t);
 	MagickBooleanType SetImageDepth(Image*, const size_t);
+	MagickBooleanType SetImageType(Image*, const ImageType);
 
 	RectangleInfo GetImageBoundingBox(const(Image)*, ExceptionInfo* exception);
 

diff --git a/dmagick/c/channel.d b/dmagick/c/channel.d
@@ -0,0 +1,22 @@
+module dmagick.c.channel;
+
+import dmagick.c.exception;
+import dmagick.c.image;
+import dmagick.c.magickType;
+import dmagick.c.magickVersion;
+
+extern(C)
+{
+	Image* CombineImages(const(Image)*, const ChannelType, ExceptionInfo*);
+
+	static if ( MagickLibVersion >= 0x678 )
+	{
+		Image* SeparateImage(const(Image)*, const ChannelType, ExceptionInfo*);
+	}
+
+	Image* SeparateImages(const(Image)*, const ChannelType, ExceptionInfo*);
+
+	MagickBooleanType GetImageAlphaChannel(const(Image)*);
+	MagickBooleanType SeparateImageChannel(Image*, const ChannelType);
+	MagickBooleanType SetImageAlphaChannel(Image*, const AlphaChannelType);
+}
diff --git a/dmagick/c/image.d b/dmagick/c/image.d
@@ -622,13 +622,11 @@ extern(C)
 	Image* AcquireImage(const(ImageInfo)*);
 	Image* AppendImages(const(Image)*, const MagickBooleanType, ExceptionInfo*);
 	Image* CloneImage(const(Image)*, const size_t, const size_t, const MagickBooleanType, ExceptionInfo*);
-	Image* CombineImages(const(Image)*, const ChannelType, ExceptionInfo*);
 	Image* DestroyImage(Image*);
 	Image* GetImageClipMask(const(Image)*, ExceptionInfo*);
 	Image* GetImageMask(const(Image)*, ExceptionInfo*);
 	Image* NewMagickImage(const(ImageInfo)*, const size_t, const size_t, const(MagickPixelPacket)*);
 	Image* ReferenceImage(Image*);
-	Image* SeparateImages(const(Image)*, const ChannelType, ExceptionInfo*);
 
 	static if ( MagickLibVersion >= 0x668 )
 	{
@@ -646,16 +644,13 @@ extern(C)
 
 	MagickBooleanType ClipImage(Image*);
 	MagickBooleanType ClipImagePath(Image*, const(char)*, const MagickBooleanType);
-	MagickBooleanType GetImageAlphaChannel(const(Image)*);
 	MagickBooleanType IsTaintImage(const(Image)*);
 	MagickBooleanType IsMagickConflict(const(char)*);
 	MagickBooleanType IsHighDynamicRangeImage(const(Image)*, ExceptionInfo*);
 	MagickBooleanType IsImageObject(const(Image)*);
 	MagickBooleanType ListMagickInfo(FILE*, ExceptionInfo*);
 	MagickBooleanType ModifyImage(Image**, ExceptionInfo*);
 	MagickBooleanType ResetImagePage(Image*, const(char)*);
-	MagickBooleanType SeparateImageChannel(Image*, const ChannelType);
-	MagickBooleanType SetImageAlphaChannel(Image*, const AlphaChannelType);
 	MagickBooleanType SetImageBackgroundColor(Image*);
 	MagickBooleanType SetImageClipMask(Image*, const(Image)*);
 
@@ -676,7 +671,6 @@ extern(C)
 	}
 
 	MagickBooleanType SetImageStorageClass(Image*, const ClassType);
-	MagickBooleanType SetImageType(Image*, const ImageType);
 	MagickBooleanType StripImage(Image*);
 	MagickBooleanType SyncImage(Image*);
 	MagickBooleanType SyncImageSettings(const(ImageInfo)*, Image*);

diff --git a/dmagick/c/magickType.d b/dmagick/c/magickType.d
@@ -20,8 +20,12 @@ extern (C)
 		enum QuantumRange = Quantum.max;
 		enum MAGICKCORE_QUANTUM_DEPTH = 8;
 		enum MaxColormapSize = 256;
-		enum MagickEpsilon = 1.0e-6;
-		enum MagickHuge    = 1.0e6;
+
+		static if ( MagickLibVersion < 0x678 )
+		{
+			enum MagickEpsilon = 1.0e-6;
+			enum MagickHuge    = 1.0e6;
+		}
 	}
 	else version(Quantum32)
 	{
@@ -39,8 +43,12 @@ extern (C)
 		enum QuantumRange = Quantum.max;
 		enum MAGICKCORE_QUANTUM_DEPTH = 32;
 		enum MaxColormapSize = 65536;
-		enum MagickEpsilon = 1.0e-10;
-		enum MagickHuge    = 1.0e12;
+
+		static if ( MagickLibVersion < 0x678 )
+		{
+			enum MagickEpsilon = 1.0e-10;
+			enum MagickHuge    = 1.0e12;
+		}
 	}
 	else version(Quantum64)
 	{
@@ -60,8 +68,12 @@ extern (C)
 		enum QuantumRange = 18446744073709551615.0;
 		enum MAGICKCORE_QUANTUM_DEPTH = 64;
 		enum MaxColormapSize = 65536;
-		enum MagickEpsilon = 1.0e-10;
-		enum MagickHuge = 1.0e12;
+
+		static if ( MagickLibVersion < 0x678 )
+		{
+			enum MagickEpsilon = 1.0e-10;
+			enum MagickHuge = 1.0e12;
+		}
 	}
 	else
 	{
@@ -79,8 +91,18 @@ extern (C)
 		enum QuantumRange = Quantum.max;
 		enum MAGICKCORE_QUANTUM_DEPTH = 16;
 		enum MaxColormapSize = 65536;
-		enum MagickEpsilon = 1.0e-10;
-		enum MagickHuge    = 1.0e12;
+
+		static if ( MagickLibVersion < 0x678 )
+		{
+			enum MagickEpsilon = 1.0e-10;
+			enum MagickHuge    = 1.0e12;
+		}
+	}
+
+	static if ( MagickLibVersion >= 0x678 )
+	{
+		enum MagickRealType MagickEpsilon = 2.220446e-16;
+		enum MagickRealType MagickHuge    = 1.0/MagickEpsilon;
 	}
 
 	alias uint  MagickStatusType;

diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d
@@ -123,13 +123,20 @@ extern(C)
 		///ditto
 		enum MagickLibVersionText = "6.7.6";
 	}
-	else
+	else version(MagickCore_677)
 	{
 		/// Defines the version of ImageMagick where these headers are based on.
 		enum MagickLibVersion = 0x677;
 		///ditto
 		enum MagickLibVersionText = "6.7.7";
 	}
+	else
+	{
+		/// Defines the version of ImageMagick where these headers are based on.
+		enum MagickLibVersion = 0x678;
+		///ditto
+		enum MagickLibVersionText = "6.7.8";
+	}
 
 	/*
 	 * With ImageMagick 6.6.3 long and unsinged long were changed to

diff --git a/dmagick/c/pixel.d b/dmagick/c/pixel.d
@@ -25,7 +25,12 @@ extern(C)
 		IntegerInterpolatePixel,         /// The color of the top-left pixel (floor function).
 		MeshInterpolatePixel,            /// Divide area into two flat triangular interpolations.
 		NearestNeighborInterpolatePixel, /// The nearest pixel to the lookup point (rounded function).
-		SplineInterpolatePixel           /// Direct spline curves (colors are blurred).
+		SplineInterpolatePixel,          /// Direct spline curves (colors are blurred).
+		Average9InterpolatePixel,        /// Average 9 nearest neighbours.
+		Average16InterpolatePixel,       /// Average 16 nearest neighbours.
+		BlendInterpolatePixel,           /// blend of nearest 1, 2 or 4 pixels.
+		BackgroundInterpolatePixel,      /// just return background color.
+		CatromInterpolatePixel           /// Catmull-Rom interpolation.
 	}
 
 
@@ -134,5 +139,10 @@ extern(C)
 		MagickBooleanType InterpolateMagickPixelPacket(const Image*, const CacheView*, const InterpolatePixelMethod, const double, const double, MagickPixelPacket*, ExceptionInfo*);
 	}
 
+	static if ( MagickLibVersion >= 0x678 )
+	{
+		MagickPixelPacket* CloneMagickPixelPacket(const(MagickPixelPacket)*);
+	}
+
 	void GetMagickPixelPacket(const(Image)*, MagickPixelPacket*);
 }
diff --git a/dmagick/c/resample.d b/dmagick/c/resample.d
@@ -67,6 +67,7 @@ extern(C)
 			RobidouxFilter,      /// ditto
 			RobidouxSharpFilter, /// ditto
 			CosineFilter,        /// ditto
+			SplineFilter,        /// ditto
 			SentinelFilter,      // a count of all the filters, not a real filter
 
 			BesselFilter         = JincFilter,

diff --git a/dmagick/c/resize.d b/dmagick/c/resize.d
@@ -8,6 +8,12 @@ import dmagick.c.resample;
 extern(C)
 {
 	Image* AdaptiveResizeImage(const(Image)*, const size_t, const size_t, ExceptionInfo*);
+
+	static if ( MagickLibVersion >= 0x678 )
+	{
+		Image* InterpolativeResizeImage(const(Image)*, const size_t, const size_t, const InterpolatePixelMethod, ExceptionInfo*);
+	}
+
 	Image* LiquidRescaleImage(const(Image)*, const size_t, const size_t, const double, const double, ExceptionInfo*);
 	Image* MagnifyImage(const(Image)*, ExceptionInfo*);
 	Image* MinifyImage(const(Image)*, ExceptionInfo*);

diff --git a/windows.mak b/windows.mak
@@ -33,6 +33,7 @@ SOURCE= \
 	dmagick\c\blob.d \
 	dmagick\c\cache.d \
 	dmagick\c\cacheView.d \
+	dmagick\c\channel.d \
 	dmagick\c\cipher.d \
 	dmagick\c\client.d \
 	dmagick\c\coder.d \