From 0f6182f1e0584cf52a7529b9408c24383d8d3068 Mon Sep 17 00:00:00 2001 From: dirk Date: Thu, 28 Apr 2016 11:53:54 +0200 Subject: [PATCH] Fixed exit code of compare command. --- utilities/magick.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/utilities/magick.c b/utilities/magick.c index d5334b027..a5802723b 100644 --- a/utilities/magick.c +++ b/utilities/magick.c @@ -105,6 +105,7 @@ static int MagickMain(int argc,char **argv) *image_info; int + exit_code, offset; MagickBooleanType @@ -147,10 +148,25 @@ static int MagickMain(int argc,char **argv) (void) fputs(metadata,stdout); metadata=DestroyString(metadata); } + if (MagickCommands[i].command != CompareImagesCommand) + exit_code=status != MagickFalse ? 0 : 1; + else + { + if (status == MagickFalse) + exit_code=2; + else + { + const char + *option; + + option=GetImageOption(image_info,"compare:dissimilar"); + exit_code=IsStringTrue(option) ? 1 : 0; + } + } image_info=DestroyImageInfo(image_info); exception=DestroyExceptionInfo(exception); MagickCoreTerminus(); - return(status != MagickFalse ? 0 : 1); + return(exit_code); } #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) -- 2.40.0