Added "+combine {colorspace}"

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 45b2d87b40fd5c4014ddd1a0ba6e1d6bbbdd5ff6..1800d140c44f92a37e046bdf47c9a9a564d63eaa 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -293,8 +293,8 @@ static const OptionInfo
     { "-colors", 1L, SimpleOperatorFlag, MagickFalse },
     { "+colorspace", 0L, ImageInfoOptionFlag | SimpleOperatorFlag, MagickFalse },
     { "-colorspace", 1L, ImageInfoOptionFlag | SimpleOperatorFlag, MagickFalse },
-    { "+combine", 1L, DeprecateOptionFlag | FireOptionFlag, MagickTrue },
-    { "-combine", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse },
+    { "+combine", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse },
+    { "-combine", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse },
     { "+comment", 0L, ImageInfoOptionFlag | NeverInterpretArgsFlag, MagickFalse },
     { "-comment", 1L, ImageInfoOptionFlag | NeverInterpretArgsFlag, MagickFalse },
     { "+compose", 0L, ImageInfoOptionFlag, MagickFalse },

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 3f9845b06a91cd9ce1c686a029f7b3ddc7eafca9..c9b5accfed1dd967a901b365abad261c2104988c 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -3621,8 +3621,10 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand,
         }
       if (LocaleCompare("combine",option+1) == 0)
         {
-          /* FUTURE - this may be replaced by a 'channel' method */
-          parse = ParseCommandOption(MagickColorspaceOptions,MagickFalse,arg1);
+          parse = (ssize_t) sRGBColorspace; /* default (backward compatible) */
+          if ( IfPlusOp )
+            parse = ParseCommandOption(MagickColorspaceOptions,MagickFalse,
+                 arg1);
           if (parse < 0)
             CLIWandExceptArgBreak(OptionError,"UnrecognizedColorspace",option,
               arg1);