From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 13 Dec 2012 15:42:17 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4607
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4d552cbf0187d092fc9f83fdca1ef6ce90206fb;p=imagemagick

---

diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c
index e78729b9e..9a884ee70 100644
--- a/MagickCore/cache-view.c
+++ b/MagickCore/cache-view.c
@@ -125,7 +125,7 @@ MagickExport CacheView *AcquireAuthenticCacheView(const Image *image)
     {
       CatchException(exception);
       MagickCoreTerminus();
-      _exit(CacheFatalError);
+      _exit((int) (CacheFatalError-FatalErrorException)+1);
     }
   exception=DestroyExceptionInfo(exception);
   return(cache_view);
diff --git a/MagickCore/exception-private.h b/MagickCore/exception-private.h
index 98f64c336..cb6b7eb0b 100644
--- a/MagickCore/exception-private.h
+++ b/MagickCore/exception-private.h
@@ -49,7 +49,7 @@ extern "C" {
   CatchException(&exception); \
   (void) DestroyExceptionInfo(&exception); \
   MagickCoreTerminus(); \
-  _exit(severity); \
+  _exit((int) (severity-FatalErrorException)+1); \
 }
 #define ThrowFileException(exception,severity,tag,context) \
 { \
diff --git a/MagickCore/exception.c b/MagickCore/exception.c
index 5e7d9eac0..fb50942f3 100644
--- a/MagickCore/exception.c
+++ b/MagickCore/exception.c
@@ -341,7 +341,7 @@ static void DefaultFatalErrorHandler(const ExceptionType severity,
   (void) FormatLocaleFile(stderr,".\n");
   (void) fflush(stderr);
   MagickCoreTerminus();
-  exit(severity);
+  exit((int) (severity-FatalErrorException)+1);
 }
 
 /*
diff --git a/tests/validate.c b/tests/validate.c
index c3d3dfade..ec55979d3 100644
--- a/tests/validate.c
+++ b/tests/validate.c
@@ -1374,7 +1374,7 @@ int main(int argc,char **argv)
   /*
     Validate the ImageMagick image processing suite.
   */
-  MagickCoreGenesis(*argv,MagickFalse);
+  MagickCoreGenesis(*argv,MagickTrue);
   (void) setlocale(LC_ALL,"");
   (void) setlocale(LC_NUMERIC,"C");
   iterations=1;