From dfea6fe8fe2af9c05134e83b5d867e6d7774900c Mon Sep 17 00:00:00 2001 From: Cristy Date: Wed, 15 Mar 2017 08:03:38 -0400 Subject: [PATCH] ... --- MagickWand/compare.c | 1 - MagickWand/operation.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/MagickWand/compare.c b/MagickWand/compare.c index 4f0ffd86b..e43e60bf2 100644 --- a/MagickWand/compare.c +++ b/MagickWand/compare.c @@ -395,7 +395,6 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info, if (channel < 0) ThrowCompareException(OptionError,"UnrecognizedChannelType", argv[i]); - (void) SetPixelChannelMask(image,(ChannelType) channel); break; } if (LocaleCompare("colorspace",option+1) == 0) diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 0ee18225c..0e1b64bd8 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -1907,9 +1907,8 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, } if (LocaleCompare("cdl",option+1) == 0) { - /* Note: arguments do not have percent escapes expanded */ char - *color_correction_collection; + *color_correction_collection; /* Note: arguments do not have percent escapes expanded */ /* Color correct with a color decision list. @@ -1930,8 +1929,8 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, } parse=ParseChannelOption(arg1); if (parse < 0) - CLIWandExceptArgBreak(OptionError,"UnrecognizedIntensityMethod", - option,arg1); + CLIWandExceptArgBreak(OptionError,"UnrecognizedChannelType",option, + arg1); (void) SetPixelChannelMask(_image,(ChannelType) parse); break; } @@ -3785,7 +3784,8 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand, if (LocaleCompare("average",option+1) == 0) { CLIWandWarnReplaced("-evaluate-sequence Mean"); - (void) CLIListOperatorImages(cli_wand,"-evaluate-sequence","Mean",NULL); + (void) CLIListOperatorImages(cli_wand,"-evaluate-sequence","Mean", + NULL); break; } CLIWandExceptionBreak(OptionError,"UnrecognizedOption",option); -- 2.40.0