(no commit message)

diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index a78468a7200af21d147df3ac51731e3c56a4b4d7..7cae8df0642dfc6b311560b5a84875f3fb595286 100644 (file)
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -333,8 +333,6 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression,
       case ExchangeChannelOp:
       case TransferChannelOp:
       {
-        if (LocaleCompare(token,"black") == 0)
-          SetImageColorspace(destination_image,CMYKColorspace,exception);
         i=ParsePixelChannelOption(token);
         if (i < 0)
           {
@@ -344,6 +342,15 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression,
             return(destination_image);
           }
         destination_channel=(PixelChannel) i;
+        if ((LocaleCompare(token,"black") == 0) ||
+            (LocaleCompare(token,"c") == 0) ||
+            (LocaleCompare(token,"cyan") == 0) ||
+            (LocaleCompare(token,"k") == 0) ||
+            (LocaleCompare(token,"m") == 0) ||
+            (LocaleCompare(token,"magenta") == 0) ||
+            (LocaleCompare(token,"y") == 0) ||
+            (LocaleCompare(token,"yellow") == 0))
+          SetImageColorspace(destination_image,CMYKColorspace,exception);
         GetMagickToken(p,&p,token);
         break;
       }

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 78815bec7779764eecc14fb28c698543564568db..0d61e000ed9fd99ab52a2005c95e12774abe8417 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1358,22 +1358,29 @@ static const OptionInfo
   PixelChannelOptions[] =
   {
     { "Undefined", UndefinedPixelChannel, UndefinedOptionFlag, MagickFalse },
+    { "A", AlphaPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Alpha", AlphaPixelChannel, UndefinedOptionFlag, MagickFalse },
+    { "B", BluePixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Black", BlackPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Blue", BluePixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Cb", CbPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Composite", CompositePixelChannel, UndefinedOptionFlag, MagickFalse },
+    { "C", CyanPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Cr", CrPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Cyan", CyanPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Gray", GrayPixelChannel, UndefinedOptionFlag, MagickFalse },
+    { "G", GreenPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Green", GreenPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Index", IndexPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Intensity", IntensityPixelChannel, UndefinedOptionFlag, MagickFalse },
+    { "K", BlackPixelChannel, UndefinedOptionFlag, MagickFalse },
+    { "M", MagentaPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Magenta", MagentaPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Mask", MaskPixelChannel, UndefinedOptionFlag, MagickFalse },
+    { "R", RedPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Red", RedPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Sync", SyncPixelChannel, UndefinedOptionFlag, MagickFalse },
-    { "Y", YPixelChannel, UndefinedOptionFlag, MagickFalse },
+    { "Y", YellowPixelChannel, UndefinedOptionFlag, MagickFalse },
     { "Yellow", YellowPixelChannel, UndefinedOptionFlag, MagickFalse },
     { (char *) NULL, UndefinedPixelChannel, UndefinedOptionFlag, MagickFalse }
   },