(no commit message)

diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index edf289ffe6eb026c0b00342ba0234b612b9361d1..79389ce8412a0cefb470d7bfec036a95e0e2aed2 100644 (file)
--- 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 ebe0920f849feb278b40ba42d2757f73d9036b57..933154d72d2ad0bad972a834808c16c4d2a40116 100644 (file)
--- 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 27b1955cf5014c3b176e79d40d8bf1025d95b194..e782190a51e7efb12938b7e203c067ae66eeb721 100644 (file)
--- 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 34cd74300d234f47cedaa11df25bdd7be387b31c..34f94117284913cd54c37fa470efa81cc28c8fc5 100644 (file)
--- 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 8a9e4f9a283970df5f3e2c56dda1ecd945c4d16a..e841f4a6fae3224e94b29539e104f790d9dee4c8 100644 (file)
--- 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 d45705f4f3fb1cf65a44121f31c5d27f08a06b9b..43fbf90efb6c0798fc041b09258b3156779cc0af 100644 (file)
--- 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 e9bdc046d0d75d31f03d9990567fe6c6827a139f..7274ba06c751a22360ee5c2185f37352e326a4b8 100644 (file)
--- 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 04f7179e7619b3d0bdb31ad40f17e28f7bf5b794..9be9d949b2ede0cc68bfdaec1c7bf687a9269b00 100644 (file)
--- 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 0b4c766b23fe45875bb2074f5c887672f1316a5f..7e496f21e09002a071125babf2d844bf3527294f 100644 (file)
--- 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 acbf3ddc5fb522a9e17de1dc570e2305ffa083f3..6c57948837d28eae4bea9ce50dd28175ab13b8d4 100644 (file)
--- 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 0a3b99b6116af67abe69f9351da3017f73f72502..80ad301e21e4933a4f33d1bbfcb607b4e5a22457 100644 (file)
--- 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 854dc38e77f5017e7574c84fee69aa18f3e5dba4..f66b990036b3de334b3774347d6c5d76cdedb5fd 100644 (file)
--- 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 ebaee279d7c2dd6eacb3cc5cbfcc455567a146e7..ef06511054c69d22bcf67a036ba60b996df6a39c 100644 (file)
--- 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 1f20a3d1f685bda926b0e848b205abdfc3f46b4a..6e552bff156f4ac90a2a22bdcca6f63ece324c3c 100644 (file)
--- 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 aba7fc09432f7d8791971bc7f6c6bcfdfa3ae9ae..fbd83fa29e68189091fc5aabc40ac539710eed0e 100644 (file)
--- 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 3dd2c290e08157059045e3c58e532970fb981c47..559ecc7d5c7c0f7cfb87219b958eb7eab33727ae 100644 (file)
--- 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