From: anthony <anthony@git.imagemagick.org>
Date: Wed, 1 May 2013 04:48:57 +0000 (+0000)
Subject: Added "+combine {colorspace}"
X-Git-Tag: 7.0.1-0~3762
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a4ff37398c7bc97588bd66d840cda9c653cec5e;p=imagemagick

Added "+combine {colorspace}"
---

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 45b2d87b4..1800d140c 100644
--- 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 3f9845b06..c9b5accfe 100644
--- 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);