summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dmagick/Image.d30
-rw-r--r--dmagick/ImageView.d3
-rw-r--r--dmagick/Options.d10
-rw-r--r--examples/draw.d3
4 files changed, 42 insertions, 4 deletions
diff --git a/dmagick/Image.d b/dmagick/Image.d
index 2f992a9..c709ee3 100644
--- a/dmagick/Image.d
+++ b/dmagick/Image.d
@@ -25,6 +25,35 @@ import dmagick.Utils;
//Import all translated c headers.
import dmagick.c.MagickCore;
+public alias dmagick.c.geometry.AffineMatrix AffineMatrix;
+public alias dmagick.c.image.AlphaChannelType AlphaChannelType;
+public alias dmagick.c.magickType.ChannelType ChannelType;
+public alias dmagick.c.image.ChromaticityInfo ChromaticityInfo;
+public alias dmagick.c.magickType.ClassType ClassType;
+public alias dmagick.c.colorspace.ColorspaceType ColorspaceType;
+public alias dmagick.c.composite.CompositeOperator CompositeOperator;
+public alias dmagick.c.compress.CompressionType CompressionType;
+public alias dmagick.c.layer.DisposeType DisposeType;
+public alias dmagick.c.distort.DistortImageMethod DistortImageMethod;
+public alias dmagick.c.quantum.EndianType EndianType;
+public alias dmagick.c.resample.FilterTypes FilterTypes;
+public alias dmagick.c.geometry.GravityType GravityType;
+public alias dmagick.c.image.ImageType ImageType;
+public alias dmagick.c.image.InterlaceType InterlaceType;
+public alias dmagick.c.pixel.InterpolatePixelMethod InterpolatePixelMethod;
+public alias dmagick.c.statistic.MagickEvaluateOperator MagickEvaluateOperator;
+public alias dmagick.c.statistic.MagickFunction MagickFunction;
+public alias dmagick.c.fx.NoiseType NoiseType;
+public alias dmagick.c.image.OrientationType OrientationType;
+public alias dmagick.c.effect.PreviewType PreviewType;
+public alias dmagick.c.magickType.Quantum Quantum;
+public alias dmagick.c.profile.RenderingIntent RenderingIntent;
+public alias dmagick.c.image.ResolutionType ResolutionType;
+public alias dmagick.c.distort.SparseColorMethod SparseColorMethod;
+public alias dmagick.c.effect.StatisticType StatisticType;
+public alias dmagick.c.constitute.StorageType StorageType;
+public alias dmagick.c.cacheView.VirtualPixelMethod VirtualPixelMethod;
+
alias ptrdiff_t ssize_t;
/**
@@ -4198,4 +4227,3 @@ version (Windows)
}
}
-
diff --git a/dmagick/ImageView.d b/dmagick/ImageView.d
index f23f23a..a6f68be 100644
--- a/dmagick/ImageView.d
+++ b/dmagick/ImageView.d
@@ -25,6 +25,9 @@ import dmagick.c.magickType;
import dmagick.c.memory;
import dmagick.c.pixel;
+//These symbols are publicly imported by dmagick.Image.
+private alias dmagick.c.magickType.Quantum Quantum;
+
alias ptrdiff_t ssize_t;
/**
diff --git a/dmagick/Options.d b/dmagick/Options.d
index cec9b28..40dc560 100644
--- a/dmagick/Options.d
+++ b/dmagick/Options.d
@@ -33,6 +33,16 @@ import dmagick.c.quantize;
import dmagick.c.quantum;
import dmagick.c.type;
+//These symbols are publicly imported by dmagick.Image.
+private alias dmagick.c.geometry.AffineMatrix AffineMatrix;
+private alias dmagick.c.colorspace.ColorspaceType ColorspaceType;
+private alias dmagick.c.compress.CompressionType CompressionType;
+private alias dmagick.c.quantum.EndianType EndianType;
+private alias dmagick.c.image.ImageType ImageType;
+private alias dmagick.c.image.InterlaceType InterlaceType;
+private alias dmagick.c.image.ResolutionType ResolutionType;
+private alias dmagick.c.cacheView.VirtualPixelMethod VirtualPixelMethod;
+
/**
* A class that wraps ImageInfo, DrawInfo and QuantizeInfo
*/
diff --git a/examples/draw.d b/examples/draw.d
index 358e942..deed525 100644
--- a/examples/draw.d
+++ b/examples/draw.d
@@ -14,9 +14,6 @@ import dmagick.DrawingContext;
import dmagick.Geometry;
import dmagick.Image;
-//TODO: Easier way to import symbols from the headers used by DMagick.
-import dmagick.c.geometry;
-
void main()
{
int percentage = 95;