(no commit message)

diff --git a/MagickWand/magick-wand-private.h b/MagickWand/magick-wand-private.h
index ec6ba80cdc9a48e809027d761f7ed142eb384251..e0770ddf9e201746e2c2deb493514c821c5498cc 100644 (file)
--- 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 f7ec3ee91462022106a14865f18bd9a5e4ecbfde..3089c6d91ce063ed7ccf6f14f7e0c12f5d1f66ea 100644 (file)
--- 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.
 */