https://github.com/ImageMagick/ImageMagick/pull/1798

1 files changed, 25 insertions, 21 deletions

diff --git a/tests/wandtest.c b/tests/wandtest.c
index f7f639490..beb41e2f2 100644
--- a/tests/wandtest.c
+++ b/tests/wandtest.c
@@ -5170,9 +5170,6 @@ int main(int argc,char **argv)
     **properties,
     *property;
 
-  DrawingWand
-    *drawing_wand;
-
   ExceptionType
     severity;
 
@@ -5186,7 +5183,6 @@ int main(int argc,char **argv)
   PixelWand
     *background,
     *border,
-    *fill,
     **pixels;
 
   register ssize_t
@@ -5305,23 +5301,31 @@ int main(int argc,char **argv)
     ThrowAPIException(magick_wand);
   background=DestroyPixelWand(background);
   border=DestroyPixelWand(border);
-  drawing_wand=NewDrawingWand();
-  (void) PushDrawingWand(drawing_wand);
-  (void) DrawRotate(drawing_wand,45);
-  if (getenv("MAGICK_FONT") != 0)
-    (void) DrawSetFont(drawing_wand,getenv("MAGICK_FONT"));
-  (void) DrawSetFontSize(drawing_wand,18);
-  fill=NewPixelWand();
-  (void) PixelSetColor(fill,"green");
-  (void) DrawSetFillColor(drawing_wand,fill);
-  fill=DestroyPixelWand(fill);
-  (void) DrawAnnotation(drawing_wand,15,5,(const unsigned char *) "Magick");
-  (void) PopDrawingWand(drawing_wand);
-  (void) MagickSetIteratorIndex(magick_wand,1);
-  status=MagickDrawImage(magick_wand,drawing_wand);
-  if (status == MagickFalse)
-    ThrowAPIException(magick_wand);
-  drawing_wand=DestroyDrawingWand(drawing_wand);
+#if MAGICKCORE_FREETYPE_DELEGATE
+  {
+    DrawingWand
+      *const drawing_wand = NewDrawingWand();
+
+    PixelWand
+      *const fill = NewPixelWand();
+
+    (void) PushDrawingWand(drawing_wand);
+    (void) DrawRotate(drawing_wand,45);
+    if (getenv("MAGICK_FONT") != 0)
+      (void) DrawSetFont(drawing_wand,getenv("MAGICK_FONT"));
+    (void) DrawSetFontSize(drawing_wand,18);
+    (void) PixelSetColor(fill,"green");
+    (void) DrawSetFillColor(drawing_wand,fill);
+    (void) DestroyPixelWand(fill);
+    (void) DrawAnnotation(drawing_wand,15,5,(const unsigned char *) "Magick");
+    (void) PopDrawingWand(drawing_wand);
+    (void) MagickSetIteratorIndex(magick_wand,1);
+    status=MagickDrawImage(magick_wand,drawing_wand);
+    if (status == MagickFalse)
+      ThrowAPIException(magick_wand);
+    (void) DestroyDrawingWand(drawing_wand);
+  }
+#endif
   {
     unsigned char
       pixels[27],