From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 14 Jan 2014 20:41:16 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2878
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=369879c63719c63274b59a3b7893c1fbffde73b3;p=imagemagick

---

diff --git a/MagickWand/magick-wand-private.h b/MagickWand/magick-wand-private.h
index ec6ba80cd..e0770ddf9 100644
--- a/MagickWand/magick-wand-private.h
+++ b/MagickWand/magick-wand-private.h
@@ -28,6 +28,19 @@ extern "C" {
    (((i) & 0xfff) == 0) || \
    ((MagickOffsetType) (i) == ((MagickOffsetType) (span)-1))))
 #define RadiansToDegrees(x) (180.0*(x)/MagickPI)
+#define ThrowWandFatalException(severity,tag,context) \
+{ \
+  ExceptionInfo \
+    exception; \
+ \
+  GetExceptionInfo(&exception); \
+  (void) ThrowMagickException(&exception,GetMagickModule(),severity,tag, \
+    "`%s'",context); \
+  CatchException(&exception); \
+  (void) DestroyExceptionInfo(&exception); \
+  MagickWandTerminus(); \
+  _exit((int) (severity-FatalErrorException)+1); \
+} 
 
 struct _MagickWand
 {
diff --git a/MagickWand/studio.h b/MagickWand/studio.h
index f7ec3ee91..3089c6d91 100644
--- a/MagickWand/studio.h
+++ b/MagickWand/studio.h
@@ -351,21 +351,6 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #define PATH_MAX  4096
 #endif
 
-/*
-  Exception defines.
-*/
-#define ThrowWandFatalException(severity,tag,context) \
-{ \
-  ExceptionInfo \
-    *fatal_exception; \
- \
-  fatal_exception=AcquireExceptionInfo(); \
-  (void) ThrowMagickException(fatal_exception,GetMagickModule(),severity,tag, \
-    "`%s'",(context)); \
-  CatchException(fatal_exception); \
-  fatal_exception=DestroyExceptionInfo(fatal_exception); \
-}
-
 /*
   Magick defines.
 */