]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Wed, 15 Mar 2017 12:03:38 +0000 (08:03 -0400)
committerCristy <urban-warrior@imagemagick.org>
Wed, 15 Mar 2017 12:03:38 +0000 (08:03 -0400)
MagickWand/compare.c
MagickWand/operation.c

index 4f0ffd86b5eb464863255a3556c0358ae4a85ff2..e43e60bf2136f36c644a706b2fdbc5a9eaad6be2 100644 (file)
@@ -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)
index 0ee18225c90c16658cd80efaa38e48409e19b241..0e1b64bd8f19a8fa4ce52ee399bde0ef5f3cca27 100644 (file)
@@ -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);