From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 4 Nov 2013 12:08:18 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=beb1a6beff37a76105c2f7a95845c2c75d8a2ff5;p=imagemagick

---

diff --git a/MagickCore/animate.c b/MagickCore/animate.c
index 65d9d97b8..05a9e641a 100644
--- a/MagickCore/animate.c
+++ b/MagickCore/animate.c
@@ -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)
diff --git a/MagickCore/display.c b/MagickCore/display.c
index 6e32a4cce..cc5ca7b21 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -9613,7 +9613,7 @@ static void XMakePanImage(Display *display,XResourceInfo *resource_info,
   status=XMakeImage(display,resource_info,&windows->pan,image,
     windows->pan.width,windows->pan.height,exception);
   if (IfMagickFalse(status) )
-    ThrowXWindowFatalException(ResourceLimitError,
+    ThrowXWindowException(ResourceLimitError,
      "MemoryAllocationFailed",image->filename);
   (void) XSetWindowBackgroundPixmap(display,windows->pan.id,
     windows->pan.pixmap);
@@ -10293,13 +10293,13 @@ static Image *XOpenImage(Display *display,XResourceInfo *resource_info,
       status=XGetCommand(display,windows->image.id,&files,&count);
       if (status == 0)
         {
-          ThrowXWindowFatalException(XServerError,"UnableToGetProperty","...");
+          ThrowXWindowException(XServerError,"UnableToGetProperty","...");
           return((Image *) NULL);
         }
       filelist=(char **) AcquireQuantumMemory((size_t) count,sizeof(*filelist));
       if (filelist == (char **) NULL)
         {
-          ThrowXWindowFatalException(ResourceLimitError,
+          ThrowXWindowException(ResourceLimitError,
             "MemoryAllocationFailed","...");
           (void) XFreeStringList(files);
           return((Image *) NULL);
@@ -13646,7 +13646,7 @@ static Image *XVisualDirectoryImage(Display *display,
   filelist=(char **) AcquireMagickMemory(sizeof(*filelist));
   if (filelist == (char **) NULL)
     {
-      ThrowXWindowFatalException(ResourceLimitError,"MemoryAllocationFailed",
+      ThrowXWindowException(ResourceLimitError,"MemoryAllocationFailed",
         filenames);
       return((Image *) NULL);
     }
@@ -13656,9 +13656,9 @@ static Image *XVisualDirectoryImage(Display *display,
   if (IfMagickFalse(status) || (number_files == 0))
     {
       if (number_files == 0)
-        ThrowXWindowFatalException(ImageError,"NoImagesWereFound",filenames)
+        ThrowXWindowException(ImageError,"NoImagesWereFound",filenames)
       else
-        ThrowXWindowFatalException(ResourceLimitError,"MemoryAllocationFailed",
+        ThrowXWindowException(ResourceLimitError,"MemoryAllocationFailed",
           filenames);
       return((Image *) NULL);
     }
@@ -13728,7 +13728,7 @@ static Image *XVisualDirectoryImage(Display *display,
     {
       read_info=DestroyImageInfo(read_info);
       XSetCursorState(display,windows,MagickFalse);
-      ThrowXWindowFatalException(ImageError,"NoImagesWereLoaded",filenames);
+      ThrowXWindowException(ImageError,"NoImagesWereLoaded",filenames);
       return((Image *) NULL);
     }
   /*
@@ -13846,7 +13846,7 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display,
     }
   if (window_info.id == (Window) NULL)
     {
-      ThrowXWindowFatalException(XServerError,"NoWindowWithSpecifiedIDExists",
+      ThrowXWindowException(XServerError,"NoWindowWithSpecifiedIDExists",
         resources.window_id);
       return(MagickFalse);
     }
@@ -15047,7 +15047,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info,
       display_image->filename);
   status=XMakeImage(display,resource_info,&windows->magnify,(Image *) NULL,
     windows->magnify.width,windows->magnify.height,exception);
-  if (IfMagickFalse(status) )
+  if (IfMagickFalse(status))
     ThrowXWindowFatalException(XServerFatalError,"UnableToCreateXImage",
       display_image->filename);
   if (IfMagickTrue(windows->magnify.mapped) )
diff --git a/MagickCore/widget.c b/MagickCore/widget.c
index 052ea049d..a8105bc29 100644
--- a/MagickCore/widget.c
+++ b/MagickCore/widget.c
@@ -2997,7 +2997,7 @@ MagickPrivate int XCommandWidget(Display *display,XWindows *windows,
         sizeof(*selection_info));
       if (selection_info == (XWidgetInfo *) NULL)
         {
-          ThrowXWindowFatalException(ResourceLimitError,
+          ThrowXWindowFatalException(ResourceLimitFatalError,
             "MemoryAllocationFailed","...");
           return(id);
         }