From: dirk <dirk@git.imagemagick.org>
Date: Thu, 5 Jun 2014 18:21:08 +0000 (+0000)
Subject: Fix for exit code under Windows.
X-Git-Tag: 7.0.1-0~2246
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c746fb9444d9dc6025c2b1cc8bac1c33e67c43a;p=imagemagick

Fix for exit code under Windows.
---

diff --git a/utilities/animate.c b/utilities/animate.c
index e841f4a6f..0a2f9a902 100644
--- a/utilities/animate.c
+++ b/utilities/animate.c
@@ -111,6 +111,6 @@ int wmain(int argc,wchar_t *argv[])
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status != MagickFalse ? 0 : 1);
+  return(status);
 }
 #endif
diff --git a/utilities/compare.c b/utilities/compare.c
index 43fbf90ef..3e9caa9a7 100644
--- a/utilities/compare.c
+++ b/utilities/compare.c
@@ -116,6 +116,6 @@ int wmain(int argc,wchar_t *argv[])
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status != MagickFalse ? 0 : 2);
+  return(status);
 }
 #endif
diff --git a/utilities/composite.c b/utilities/composite.c
index 7274ba06c..631c39106 100644
--- a/utilities/composite.c
+++ b/utilities/composite.c
@@ -102,6 +102,6 @@ int wmain(int argc,wchar_t *argv[])
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status != MagickFalse ? 0 : 1);
+  return(status);
 }
 #endif
diff --git a/utilities/conjure.c b/utilities/conjure.c
index 9be9d949b..c7b38448e 100644
--- a/utilities/conjure.c
+++ b/utilities/conjure.c
@@ -121,6 +121,6 @@ int wmain(int argc,wchar_t *argv[])
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status != MagickFalse ? 0 : 1);
+  return(status);
 }
 #endif
diff --git a/utilities/convert.c b/utilities/convert.c
index 7e496f21e..4b9959b82 100644
--- a/utilities/convert.c
+++ b/utilities/convert.c
@@ -108,6 +108,6 @@ int wmain(int argc,wchar_t *argv[])
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status != MagickFalse ? 0 : 1);
+  return(status != MagickFalse);
 }
 #endif
diff --git a/utilities/display.c b/utilities/display.c
index 6c5794883..cec382fda 100644
--- a/utilities/display.c
+++ b/utilities/display.c
@@ -116,6 +116,6 @@ int wmain(int argc,wchar_t *argv[])
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status != MagickFalse ? 0 : 1);
+  return(status);
 }
 #endif
diff --git a/utilities/identify.c b/utilities/identify.c
index 80ad301e2..ebc6070a3 100644
--- a/utilities/identify.c
+++ b/utilities/identify.c
@@ -109,6 +109,6 @@ int wmain(int argc,wchar_t *argv[])
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status != MagickFalse ? 0 : 1);
+  return(status);
 }
 #endif
diff --git a/utilities/import.c b/utilities/import.c
index f66b99003..6ccc5d151 100644
--- a/utilities/import.c
+++ b/utilities/import.c
@@ -108,6 +108,6 @@ int wmain(int argc,wchar_t *argv[])
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status != MagickFalse ? 0 : 1);
+  return(status);
 }
 #endif
diff --git a/utilities/magick.c b/utilities/magick.c
index ef0651105..b08471961 100644
--- a/utilities/magick.c
+++ b/utilities/magick.c
@@ -101,6 +101,6 @@ int wmain(int argc,wchar_t *argv[])
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status != MagickFalse ? 0 : 1);
+  return(status);
 }
 #endif
diff --git a/utilities/mogrify.c b/utilities/mogrify.c
index 6e552bff1..e5a9ef5bd 100644
--- a/utilities/mogrify.c
+++ b/utilities/mogrify.c
@@ -104,6 +104,6 @@ int wmain(int argc,wchar_t *argv[])
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status != MagickFalse ? 0 : 1);
+  return(status);
 }
 #endif
diff --git a/utilities/montage.c b/utilities/montage.c
index fbd83fa29..70e55e0ef 100644
--- a/utilities/montage.c
+++ b/utilities/montage.c
@@ -104,6 +104,6 @@ int wmain(int argc,wchar_t *argv[])
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status != MagickFalse ? 0 : 1);
+  return(status);
 }
 #endif
diff --git a/utilities/stream.c b/utilities/stream.c
index 559ecc7d5..b1c121f31 100644
--- a/utilities/stream.c
+++ b/utilities/stream.c
@@ -104,6 +104,6 @@ int wmain(int argc,wchar_t *argv[])
   for (i=0; i < argc; i++)
     utf8[i]=DestroyString(utf8[i]);
   utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status != MagickFalse ? 0 : 1);
+  return(status);
 }
 #endif