Remove "channel" as a simple operator (setting only)

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 50db725d594469ef99a550981320bd4095dc7be4..a39c8a0d91879f21b1b4ed40e0f2762682f3fdcc 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -252,8 +252,8 @@ static const OptionInfo
     { "-caption", 1L, ImageInfoOptionFlag, MagickFalse },
     { "+cdl", 1L, DeprecateOptionFlag, MagickTrue },
     { "-cdl", 1L, SimpleOperatorOptionFlag, MagickFalse },
-    { "+channel", 0L, ImageInfoOptionFlag | SimpleOperatorOptionFlag, MagickFalse },
-    { "-channel", 1L, ImageInfoOptionFlag | SimpleOperatorOptionFlag, MagickFalse },
+    { "+channel", 0L, ImageInfoOptionFlag, MagickFalse },
+    { "-channel", 1L, ImageInfoOptionFlag, MagickFalse },
     { "-channel-fx", 1L, ListOperatorOptionFlag | FireOptionFlag, MagickFalse },
     { "+charcoal", 0L, DeprecateOptionFlag, MagickTrue },
     { "-charcoal", 0L, SimpleOperatorOptionFlag, MagickFalse },

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 6454adac55f3d9132a99f4d8a9f1a6ed160fc90a..caf5a3211e41a3b6c5891864f9a2e4f8fccbeeb8 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -1912,15 +1912,6 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand,
             _exception);
           break;
         }
-      if (LocaleCompare("channel",option+1) == 0)
-        {
-          /* The "channel" setting has already been set
-             FUTURE: This probably should be part of SyncImageSettings().
-             How is it applied to new images?
-          SetPixelChannelMapMask(_image,_image_info->channel);
-          */
-          break;
-        }
       if (LocaleCompare("charcoal",option+1) == 0)
         {
           if (IsGeometry(arg1) == MagickFalse)