From 3589219a2c7a9a59bfa63dd5171a27b1c9424cf1 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 26 May 2014 12:04:36 +0000
Subject: [PATCH]

---
 MagickCore/threshold.c |  2 +-
 MagickWand/mogrify.c   |  2 +-
 coders/jpeg.c          |  4 +---
 tests/validate.c       | 12 ++++++------
 utilities/animate.c    |  4 ++--
 utilities/compare.c    |  4 ++--
 utilities/composite.c  |  4 ++--
 utilities/conjure.c    |  4 ++--
 utilities/convert.c    |  4 ++--
 utilities/display.c    |  4 ++--
 utilities/identify.c   |  4 ++--
 utilities/import.c     |  4 ++--
 utilities/magick.c     |  4 ++--
 utilities/mogrify.c    |  4 ++--
 utilities/montage.c    |  4 ++--
 utilities/stream.c     |  4 ++--
 16 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index edf289ffe..79389ce84 100644
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -1226,7 +1226,7 @@ MagickExport MagickBooleanType ListThresholdMaps(FILE *file,
   MagickStatusType
     status;
 
-  status=0;
+  status=MagickTrue;
   if (file == (FILE *) NULL)
     file=stdout;
   options=GetConfigureOptions(ThresholdsFilename,exception);
diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index ebe0920f8..933154d72 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -8613,7 +8613,7 @@ WandExport MagickBooleanType MogrifyImages(ImageInfo *image_info,
     return(MagickTrue);
   (void) SetImageInfoProgressMonitor(image_info,(MagickProgressMonitor) NULL,
     (void *) NULL);
-  status=0;
+  status=MagickTrue;
 #if 0
   (void) FormatLocaleFile(stderr, "mogrify start %s %d (%s)\n",argv[0],argc,
     post?"post":"pre");
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 27b1955cf..e782190a5 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -594,11 +594,9 @@ static boolean ReadIPTCProfile(j_decompress_ptr jpeg_info)
   */
   for (i=0; i < 4; i++)
     (void) GetCharacter(jpeg_info);
-  if (length <= 4)
+  if (length <= 11)
     return(TRUE);
   length-=4;
-  if (length <= 7)
-    return(TRUE);
   error_manager=(ErrorManager *) jpeg_info->client_data;
   exception=error_manager->exception;
   image=error_manager->image;
diff --git a/tests/validate.c b/tests/validate.c
index 34cd74300..34f941172 100644
--- a/tests/validate.c
+++ b/tests/validate.c
@@ -1210,7 +1210,7 @@ static size_t ValidateCompareCommand(ImageInfo *image_info,
     for (j=0; j < (ssize_t) number_arguments; j++)
       arguments[j]=DestroyString(arguments[j]);
     arguments=(char **) RelinquishMagickMemory(arguments);
-    if (status != MagickFalse)
+    if (status == MagickFalse)
       {
         (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
           GetMagickModule());
@@ -1302,7 +1302,7 @@ static size_t ValidateCompositeCommand(ImageInfo *image_info,
     for (j=0; j < (ssize_t) number_arguments; j++)
       arguments[j]=DestroyString(arguments[j]);
     arguments=(char **) RelinquishMagickMemory(arguments);
-    if (status != MagickFalse)
+    if (status == MagickFalse)
       {
         (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
           GetMagickModule());
@@ -1393,7 +1393,7 @@ static size_t ValidateConvertCommand(ImageInfo *image_info,
     for (j=0; j < (ssize_t) number_arguments; j++)
       arguments[j]=DestroyString(arguments[j]);
     arguments=(char **) RelinquishMagickMemory(arguments);
-    if (status != MagickFalse)
+    if (status == MagickFalse)
       {
         (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
           GetMagickModule());
@@ -1485,7 +1485,7 @@ static size_t ValidateIdentifyCommand(ImageInfo *image_info,
     for (j=0; j < (ssize_t) number_arguments; j++)
       arguments[j]=DestroyString(arguments[j]);
     arguments=(char **) RelinquishMagickMemory(arguments);
-    if (status != MagickFalse)
+    if (status == MagickFalse)
       {
         (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
           GetMagickModule());
@@ -2268,7 +2268,7 @@ static size_t ValidateMontageCommand(ImageInfo *image_info,
     for (j=0; j < (ssize_t) number_arguments; j++)
       arguments[j]=DestroyString(arguments[j]);
     arguments=(char **) RelinquishMagickMemory(arguments);
-    if (status != MagickFalse)
+    if (status == MagickFalse)
       {
         (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
             GetMagickModule());
@@ -2359,7 +2359,7 @@ static size_t ValidateStreamCommand(ImageInfo *image_info,
     for (j=0; j < (ssize_t) number_arguments; j++)
       arguments[j]=DestroyString(arguments[j]);
     arguments=(char **) RelinquishMagickMemory(arguments);
-    if (status != MagickFalse)
+    if (status == MagickFalse)
       {
         (void) FormatLocaleFile(stdout,"... fail @ %s/%s/%lu.\n",
             GetMagickModule());
diff --git a/utilities/animate.c b/utilities/animate.c
index 8a9e4f9a2..e841f4a6f 100644
--- a/utilities/animate.c
+++ b/utilities/animate.c
@@ -86,7 +86,7 @@ static int AnimateMain(int argc,char **argv)
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
   MagickCoreTerminus();
-  return(status == MagickFalse ? 0 : 1);
+  return(status != MagickFalse ? 0 : 1);
 }
 
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
@@ -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 != MagickFalse ? 0 : 1);
 }
 #endif
diff --git a/utilities/compare.c b/utilities/compare.c
index d45705f4f..43fbf90ef 100644
--- a/utilities/compare.c
+++ b/utilities/compare.c
@@ -91,7 +91,7 @@ static int CompareMain(int argc,char **argv)
   MagickCoreTerminus();
   if (dissimilar != MagickFalse)
     return(1);
-  return(status == MagickFalse ? 0 : 2);
+  return(status != MagickFalse ? 0 : 2);
 }
 
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
@@ -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 != MagickFalse ? 0 : 2);
 }
 #endif
diff --git a/utilities/composite.c b/utilities/composite.c
index e9bdc046d..7274ba06c 100644
--- a/utilities/composite.c
+++ b/utilities/composite.c
@@ -77,7 +77,7 @@ static int CompositeMain(int argc,char **argv)
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
   MagickCoreTerminus();
-  return(status == MagickFalse ? 0 : 1);
+  return(status != MagickFalse ? 0 : 1);
 }
 
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
@@ -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 != MagickFalse ? 0 : 1);
 }
 #endif
diff --git a/utilities/conjure.c b/utilities/conjure.c
index 04f7179e7..9be9d949b 100644
--- a/utilities/conjure.c
+++ b/utilities/conjure.c
@@ -96,7 +96,7 @@ static int ConjureMain(int argc,char **argv)
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
   MagickCoreTerminus();
-  return(status == MagickFalse ? 0 : 1);
+  return(status != MagickFalse ? 0 : 1);
 }
 
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
@@ -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 != MagickFalse ? 0 : 1);
 }
 #endif
diff --git a/utilities/convert.c b/utilities/convert.c
index 0b4c766b2..7e496f21e 100644
--- a/utilities/convert.c
+++ b/utilities/convert.c
@@ -83,7 +83,7 @@ static int ConvertMain(int argc,char **argv)
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
   MagickCoreTerminus();
-  return(status == MagickFalse ? 0 : 1);
+  return(status != MagickFalse ? 0 : 1);
 }
 
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
@@ -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 ? 0 : 1);
 }
 #endif
diff --git a/utilities/display.c b/utilities/display.c
index acbf3ddc5..6c5794883 100644
--- a/utilities/display.c
+++ b/utilities/display.c
@@ -91,7 +91,7 @@ static int DisplayMain(int argc,char **argv)
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
   MagickCoreTerminus();
-  return(status == MagickFalse ? 0 : 1);
+  return(status != MagickFalse ? 0 : 1);
 }
 
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
@@ -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 != MagickFalse ? 0 : 1);
 }
 #endif
diff --git a/utilities/identify.c b/utilities/identify.c
index 0a3b99b61..80ad301e2 100644
--- a/utilities/identify.c
+++ b/utilities/identify.c
@@ -84,7 +84,7 @@ static int IdentifyMain(int argc,char **argv)
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
   MagickCoreTerminus();
-  return(status == MagickFalse ? 0 : 1);
+  return(status != MagickFalse ? 0 : 1);
 }
 
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
@@ -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 != MagickFalse ? 0 : 1);
 }
 #endif
diff --git a/utilities/import.c b/utilities/import.c
index 854dc38e7..f66b99003 100644
--- a/utilities/import.c
+++ b/utilities/import.c
@@ -83,7 +83,7 @@ static int ImportMain(int argc,char **argv)
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
   MagickCoreTerminus();
-  return(status == MagickFalse ? 0 : 1);
+  return(status != MagickFalse ? 0 : 1);
 }
 
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
@@ -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 ? 0 : 1);
 }
 #endif
diff --git a/utilities/magick.c b/utilities/magick.c
index ebaee279d..ef0651105 100644
--- a/utilities/magick.c
+++ b/utilities/magick.c
@@ -76,7 +76,7 @@ static int MagickMain(int argc,char **argv)
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
   MagickCoreTerminus();
-  return(status == MagickFalse ? 0 : 1);
+  return(status != MagickFalse ? 0 : 1);
 }
 
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
@@ -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 != MagickFalse ? 0 : 1);
 }
 #endif
diff --git a/utilities/mogrify.c b/utilities/mogrify.c
index 1f20a3d1f..6e552bff1 100644
--- a/utilities/mogrify.c
+++ b/utilities/mogrify.c
@@ -79,7 +79,7 @@ static int MogrifyMain(int argc,char **argv)
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
   MagickCoreTerminus();
-  return(status == MagickFalse ? 0 : 1);
+  return(status != MagickFalse ? 0 : 1);
 }
 
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
@@ -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 != MagickFalse ? 0 : 1);
 }
 #endif
diff --git a/utilities/montage.c b/utilities/montage.c
index aba7fc094..fbd83fa29 100644
--- a/utilities/montage.c
+++ b/utilities/montage.c
@@ -79,7 +79,7 @@ static int MontageMain(int argc,char **argv)
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
   MagickCoreTerminus();
-  return(status == MagickFalse ? 0 : 1);
+  return(status != MagickFalse ? 0 : 1);
 }
 
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
@@ -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 != MagickFalse ? 0 : 1);
 }
 #endif
diff --git a/utilities/stream.c b/utilities/stream.c
index 3dd2c290e..559ecc7d5 100644
--- a/utilities/stream.c
+++ b/utilities/stream.c
@@ -79,7 +79,7 @@ static int StreamMain(int argc,char **argv)
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
   MagickCoreTerminus();
-  return(status == MagickFalse ? 0 : 1);
+  return(status != MagickFalse ? 0 : 1);
 }
 
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
@@ -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 != MagickFalse ? 0 : 1);
 }
 #endif
-- 
2.40.0