(no commit message)

[imagemagick] / MagickCore / animate.c

diff --git a/MagickCore/animate.c b/MagickCore/animate.c
index 65d9d97b831241d1b580904cec939a15048d3a63..457f65586d608621224a4f3bed0646f6177aa1fc 100644 (file)
--- a/MagickCore/animate.c
+++ b/MagickCore/animate.c
@@ -13,11 +13,11 @@
 %              Methods to Interactively Animate an Image Sequence             %
 %                                                                             %
 %                             Software Design                                 %
-%                               John Cristy                                   %
+%                                  Cristy                                     %
 %                                July 1992                                    %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -840,8 +840,8 @@ MagickExport void XAnimateBackgroundImage(Display *display,
       */
       map_info=XAllocStandardColormap();
       if (map_info == (XStandardColormap *) NULL)
-        ThrowXWindowFatalException(ResourceLimitError,"MemoryAllocationFailed",
-          images->filename);
+        ThrowXWindowFatalException(ResourceLimitFatalError,
+          "MemoryAllocationFailed",images->filename);
       map_info->colormap=(Colormap) NULL;
       pixel.pixels=(unsigned long *) NULL;
       /*
@@ -868,7 +868,7 @@ MagickExport void XAnimateBackgroundImage(Display *display,
     XDestroyWindowColors(display,root_window);
   coalesce_image=CoalesceImages(images,exception);
   if (coalesce_image == (Image *) NULL)
-    ThrowXWindowFatalException(ResourceLimitError,"MemoryAllocationFailed",
+    ThrowXWindowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
       images->filename);
   images=coalesce_image;
   if (resources.map_type == (char *) NULL)
@@ -2832,7 +2832,8 @@ MagickExport Image *XAnimateImages(Display *display,
         Free X resources.
       */
       if (windows->image.mapped != MagickFalse)
-        (void) XWithdrawWindow(display,windows->image.id,windows->image.screen);      XDelay(display,SuspendTime);
+        (void) XWithdrawWindow(display,windows->image.id,windows->image.screen);
+      XDelay(display,SuspendTime);
       (void) XFreeStandardColormap(display,icon_visual,icon_map,icon_pixel);
       if (resource_info->map_type == (char *) NULL)
         (void) XFreeStandardColormap(display,visual_info,map_info,pixel);
@@ -3037,6 +3038,7 @@ MagickExport MagickBooleanType AnimateImages(const ImageInfo *image_info,
 {
   assert(image_info != (const ImageInfo *) NULL);
   assert(image_info->signature == MagickSignature);
+  (void) image_info;
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)