summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dmagick/Array.d32
-rw-r--r--dmagick/Image.d24
2 files changed, 40 insertions, 16 deletions
diff --git a/dmagick/Array.d b/dmagick/Array.d
index 0cf840e..8f3d8f9 100644
--- a/dmagick/Array.d
+++ b/dmagick/Array.d
@@ -31,7 +31,13 @@ import dmagick.c.montage;
import dmagick.c.statistic;
import dmagick.c.quantize;
-version(Windows) import dmagick.internal.Windows;
+version(DMagick_No_Display)
+{
+}
+else
+{
+ version(Windows) import dmagick.internal.Windows;
+}
/// See_Also: $(CXREF layer, _ImageLayerMethod)
public alias dmagick.c.layer.ImageLayerMethod ImageLayerMethod;
@@ -167,19 +173,25 @@ void compositeLayers(
*/
void display(Image[] images)
{
- version(Windows)
+ version(DMagick_No_Display)
{
- Window win = new Window(images);
- win.display();
}
else
{
- linkImages(images);
- scope(exit) unlinkImages(images);
-
- DisplayImages(images[0].options.imageInfo, images[0].imageRef);
-
- DMagickException.throwException(&(images[0].imageRef.exception));
+ version(Windows)
+ {
+ Window win = new Window(images);
+ win.display();
+ }
+ else
+ {
+ linkImages(images);
+ scope(exit) unlinkImages(images);
+
+ DisplayImages(images[0].options.imageInfo, images[0].imageRef);
+
+ DMagickException.throwException(&(images[0].imageRef.exception));
+ }
}
}
diff --git a/dmagick/Image.d b/dmagick/Image.d
index dc3597a..3a18a6d 100644
--- a/dmagick/Image.d
+++ b/dmagick/Image.d
@@ -25,7 +25,13 @@ import dmagick.ImageView;
import dmagick.Options;
import dmagick.Utils;
-version(Windows) import dmagick.internal.Windows;
+version(DMagick_No_Display)
+{
+}
+else
+{
+ version(Windows) import dmagick.internal.Windows;
+}
//Import all translated c headers.
import dmagick.c.MagickCore;
@@ -1225,16 +1231,22 @@ class Image
*/
void display()
{
- version(Windows)
+ version(DMagick_No_Display)
{
- Window win = new Window(this);
- win.display();
}
else
{
- DisplayImages(options.imageInfo, imageRef);
+ version(Windows)
+ {
+ Window win = new Window(this);
+ win.display();
+ }
+ else
+ {
+ DisplayImages(options.imageInfo, imageRef);
- DMagickException.throwException(&(imageRef.exception));
+ DMagickException.throwException(&(imageRef.exception));
+ }
}
}