Alias the symbols from the headers that are used in DMagick, so the user doesn't have to import them separately.

10 files changed, 37 insertions, 12 deletions

diff --git a/dmagick/Array.d b/dmagick/Array.d
index ff6865b..c6d941c 100644
--- a/dmagick/Array.d
+++ b/dmagick/Array.d
@@ -31,6 +31,8 @@ import dmagick.c.montage;
 import dmagick.c.statistic;
 import dmagick.c.quantize;
 
+public alias dmagick.c.layer.ImageLayerMethod ImageLayerMethod;
+
 alias ptrdiff_t ssize_t;
 
 /**
diff --git a/dmagick/Color.d b/dmagick/Color.d
index 2ddaa64..c9ea1ee 100644
--- a/dmagick/Color.d
+++ b/dmagick/Color.d
@@ -74,7 +74,7 @@ class Color
 	 * Create a Color and set the internal pointer to this PixelPacket.
 	 * We can use this to change pixels in an image through Color.
 	 */
-	this(PixelPacket* packet)
+	package this(PixelPacket* packet)
 	{
 		this.packet = packet;
 	}
@@ -92,6 +92,7 @@ class Color
 		this.packet.opacity = packet.opacity;
 	}
 
+	/** */
 	override bool opEquals(Object obj)
 	{
 		Color color = cast(Color)obj;
@@ -102,6 +103,9 @@ class Color
 		return pixelPacket == color.pixelPacket;
 	}
 
+	/**
+	 * Returns the value as a hex string.
+	 */
 	override string toString()
 	{
 		static if ( MagickQuantumDepth == 8 )
diff --git a/dmagick/ColorCMYK.d b/dmagick/ColorCMYK.d
index 68f1940..a0b1bd5 100644
--- a/dmagick/ColorCMYK.d
+++ b/dmagick/ColorCMYK.d
@@ -25,6 +25,7 @@ import dmagick.c.quantum;
  */
 class ColorCMYK : Color
 {
+	/** */
 	this()
 	{
 		super();
diff --git a/dmagick/ColorGray.d b/dmagick/ColorGray.d
index 884655f..45a8727 100644
--- a/dmagick/ColorGray.d
+++ b/dmagick/ColorGray.d
@@ -16,7 +16,7 @@ import dmagick.c.quantum;
  */
 class ColorGray : Color
 {
-	///
+	/** */
 	this()
 	{
 		super();
diff --git a/dmagick/ColorHSL.d b/dmagick/ColorHSL.d
index 4b64c23..291a697 100644
--- a/dmagick/ColorHSL.d
+++ b/dmagick/ColorHSL.d
@@ -23,6 +23,7 @@ import dmagick.c.quantum;
  */
 class ColorHSL : Color
 {
+	/** */
 	this()
 	{
 		super();
diff --git a/dmagick/ColorRGB.d b/dmagick/ColorRGB.d
index 1a6ae93..71d8524 100644
--- a/dmagick/ColorRGB.d
+++ b/dmagick/ColorRGB.d
@@ -16,6 +16,7 @@ import dmagick.c.quantum;
  */
 class ColorRGB : Color
 {
+	/** */
 	this()
 	{
 		super();
diff --git a/dmagick/ColorYUV.d b/dmagick/ColorYUV.d
index 5795509..d324c91 100644
--- a/dmagick/ColorYUV.d
+++ b/dmagick/ColorYUV.d
@@ -24,6 +24,7 @@ import dmagick.c.quantum;
  */
 class ColorYUV : Color
 {
+	/** */
 	this()
 	{
 		super();
diff --git a/dmagick/DrawingContext.d b/dmagick/DrawingContext.d
index 24d1f3d..e4e8c9b 100644
--- a/dmagick/DrawingContext.d
+++ b/dmagick/DrawingContext.d
@@ -24,6 +24,16 @@ import dmagick.c.draw;
 import dmagick.c.geometry;
 import dmagick.c.type;
 
+private alias dmagick.c.draw.AlignType AlignType;
+private alias dmagick.c.draw.ClipPathUnits ClipPathUnits;
+private alias dmagick.c.draw.DecorationType DecorationType;
+private alias dmagick.c.draw.FillRule FillRule;
+private alias dmagick.c.draw.LineCap LineCap;
+private alias dmagick.c.draw.LineJoin LineJoin;
+private alias dmagick.c.draw.PaintMethod PaintMethod;
+private alias dmagick.c.type.StretchType StretchType;
+private alias dmagick.c.type.StyleType StyleType;
+
 alias ptrdiff_t ssize_t;
 
 /**
@@ -898,7 +908,7 @@ class DrawingContext
 	}
 
 	/**
-	 * Generate to operations for the profide pattern.
+	 * Generate to operations to define the pattern.
 	 */
 	private string definePattern(size_t x, size_t y, size_t width, size_t height, void delegate(DrawingContext path) pattern)
 	{
diff --git a/dmagick/Geometry.d b/dmagick/Geometry.d
index 44fd5e5..a62c037 100644
--- a/dmagick/Geometry.d
+++ b/dmagick/Geometry.d
@@ -106,14 +106,6 @@ struct Geometry
 		assert( geo.width == 595 && geo.height == 842);
 	}
 
-	this(RectangleInfo rectangle)
-	{
-		this.width = rectangle.width;
-		this.height = rectangle.height;
-		this.xOffset = rectangle.x;
-		this.yOffset = rectangle.y;
-	}
-
 	/**
 	 * Initialize with width heigt and offsets.
 	 */
@@ -125,6 +117,15 @@ struct Geometry
 		this.yOffset = yOffset;
 	}
 
+	/** */
+	package this(RectangleInfo rectangle)
+	{
+		this.width = rectangle.width;
+		this.height = rectangle.height;
+		this.xOffset = rectangle.x;
+		this.yOffset = rectangle.y;
+	}
+
 	/**
 	 * Convert Geometry into a Imagemagick geometry string.
 	 */
@@ -179,7 +180,8 @@ struct Geometry
 		assert(absolute.height == 50);
 	}
 
-	RectangleInfo rectangleInfo()
+	/** */
+	package RectangleInfo rectangleInfo()
 	{
 		RectangleInfo info;
 
@@ -191,6 +193,7 @@ struct Geometry
 		return info;
 	}
 
+	/** */
 	size_t opCmp(ref const Geometry geometry)
 	{
 		return width*height - geometry.width*geometry.height;
diff --git a/dmagick/Options.d b/dmagick/Options.d
index 40dc560..db4e4e2 100644
--- a/dmagick/Options.d
+++ b/dmagick/Options.d
@@ -33,6 +33,8 @@ import dmagick.c.quantize;
 import dmagick.c.quantum;
 import dmagick.c.type;
 
+private alias dmagick.c.quantize.DitherMethod DitherMethod;
+
 //These symbols are publicly imported by dmagick.Image.
 private alias dmagick.c.geometry.AffineMatrix AffineMatrix;
 private alias dmagick.c.colorspace.ColorspaceType ColorspaceType;