(no commit message)

[imagemagick] / MagickWand / display.c

diff --git a/MagickWand/display.c b/MagickWand/display.c
index d556f89d22b0bb6b856334ab21d2aed01fa4e03b..a0898d0db03a3fecfd6e88d5167009df7a6ecd39 100644 (file)
--- a/MagickWand/display.c
+++ b/MagickWand/display.c
@@ -45,7 +45,7 @@
 #include "MagickWand/MagickWand.h"
 #include "MagickWand/mogrify-private.h"
 #include "MagickCore/display-private.h"
-#include "MagickCore/nt-feature.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/string-private.h"
 #include "MagickCore/xwindow-private.h"
 \f
@@ -248,7 +248,7 @@ static MagickBooleanType DisplayUsage(void)
     "-borderwidth, -font, -foreground, -iconGeometry, -iconic, -mattecolor,\n");
   (void) printf("-name, -shared-memory, -usePixmap, or -title.\n");
   (void) printf(
-    "\nBy default, the image format of `file' is determined by its magic\n");
+    "\nBy default, the image format of 'file' is determined by its magic\n");
   (void) printf(
     "number.  To specify a particular image format, precede the filename\n");
   (void) printf(
@@ -285,7 +285,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
 }
 #define ThrowDisplayException(asperity,tag,option) \
 { \
-  (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"`%s'", \
+  (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"'%s'", \
     option); \
   DestroyDisplay(); \
   return(MagickFalse); \
@@ -293,7 +293,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
 #define ThrowDisplayInvalidArgumentException(option,argument) \
 { \
   (void) ThrowMagickException(exception,GetMagickModule(),OptionError, \
-    "InvalidArgument","`%s': %s",option,argument); \
+    "InvalidArgument","'%s': %s",option,argument); \
   DestroyDisplay(); \
   return(MagickFalse); \
 }
@@ -448,10 +448,10 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
   image_info->quality=StringToUnsignedLong(resource_value);
   resource_value=XGetResourceInstance(resource_database,GetClientName(),
     "verbose","False");
-  image_info->verbose=IsMagickTrue(resource_value);
+  image_info->verbose=IsStringTrue(resource_value);
   resource_value=XGetResourceInstance(resource_database,GetClientName(),
     "dither","True");
-  quantize_info->dither=IsMagickTrue(resource_value);
+  quantize_info->dither=IsStringTrue(resource_value);
   /*
     Parse command line.
   */
@@ -504,6 +504,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
 
         Image
           *display_image,
+          *image_list,
           *images;
 
         /*
@@ -528,10 +529,11 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
         iterations=0;
         if (i == (ssize_t) (argc-1))
           iterations=image->iterations;
-        display_image=CloneImageList(image,exception);
-        if (display_image == (Image *) NULL)
+        image_list=CloneImageList(image,exception);
+        if (image_list == (Image *) NULL)
           ThrowDisplayException(ResourceLimitError,"MemoryAllocationFailed",
             GetExceptionMessage(errno));
+        display_image=image_list;
         do
         {
           /*
@@ -627,6 +629,9 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
         /*
           Free image resources.
         */
+        display_image=GetFirstImageInList(display_image);
+        if (image_list != display_image)
+          image_list=DestroyImageList(image_list);
         display_image=DestroyImageList(display_image);
         if ((state & FormerImageState) == 0)
           {
@@ -1903,7 +1908,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
   (void) argc;
   (void) argv;
   (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError,
-    "DelegateLibrarySupportNotBuiltIn","`%s' (X11)",image_info->filename);
+    "DelegateLibrarySupportNotBuiltIn","'%s' (X11)",image_info->filename);
   return(DisplayUsage());
 #endif
 }