From df9471df643add856597381a3dffb9eb01719828 Mon Sep 17 00:00:00 2001 From: anthony Date: Thu, 22 Mar 2012 03:53:05 +0000 Subject: [PATCH] Remove "channel" as a simple operator (setting only) --- MagickCore/option.c | 4 ++-- MagickWand/operation.c | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/MagickCore/option.c b/MagickCore/option.c index 50db725d5..a39c8a0d9 100644 --- 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 6454adac5..caf5a3211 100644 --- 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) -- 2.40.0