(no commit message)

diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c
index e78729b9edba47063021a75470d52bc8e12b789f..9a884ee702ee7435e87ebeac0e88c6500905ecca 100644 (file)
--- 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 98f64c336853d357e4ae4a2f61a7a4a713c813d9..cb6b7eb0b410a5b28f803d75292e07ecc9dac0df 100644 (file)
--- 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 5e7d9eac0de7981a820f8508e2dfd1f374e269b1..fb50942f369a80542e0cbfa711d69035479a8c22 100644 (file)
--- 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);
 }
 \f
 /*

diff --git a/tests/validate.c b/tests/validate.c
index c3d3dfade83f89ec253eb8892fd4eab9dd4650b5..ec55979d38b4d785f03c73d15874adbf078d4715 100644 (file)
--- 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;