From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 9 May 2015 12:27:33 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1046
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4a7b841de384740fd923750224430ec7750074b;p=imagemagick

---

diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index 559e3ad9c..e69eac59b 100644
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -503,7 +503,8 @@ MagickExport Image *CombineImages(const Image *image,
       combine_image=DestroyImage(combine_image);
       return((Image *) NULL);
     }
-  (void) SetImageColorspace(combine_image,colorspace,exception);
+  (void) SetImageColorspace(combine_image,colorspace == UndefinedColorspace ?
+    sRGBColorspace : colorspace,exception);
   if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
     combine_image->alpha_trait=BlendPixelTrait;
   /*
diff --git a/MagickCore/version.h b/MagickCore/version.h
index 332ca6d00..f6c810199 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-1"
 #define MagickppLibInterface  0
 #define MagickppLibMinInterface  0
-#define MagickReleaseDate  "2015-05-05"
+#define MagickReleaseDate  "2015-05-09"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeLicense  \
   "http://www.imagemagick.org/script/license.php"
diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 1351e10fd..61c749b21 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -7676,8 +7676,10 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
               *combine_image;
 
             (void) SyncImagesSettings(mogrify_info,*images,exception);
-            colorspace=(ColorspaceType) ParseCommandOption(
-              MagickColorspaceOptions,MagickFalse,argv[i+1]);
+            colorspace=UndefinedColorspace;
+            if (*option == '-')
+              colorspace=(ColorspaceType) ParseCommandOption(
+                MagickColorspaceOptions,MagickFalse,argv[i+1]);
             combine_image=CombineImages(*images,colorspace,exception);
             if (combine_image == (Image *) NULL)
               {
diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 8b102cb3e..936e87dce 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -3733,7 +3733,7 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand,
         }
       if (LocaleCompare("combine",option+1) == 0)
         {
-          parse=(ssize_t) _images->colorspace;
+          parse=(ssize_t) UndefinedColorspace;
           if ( IfPlusOp )
             parse=ParseCommandOption(MagickColorspaceOptions,MagickFalse,arg1);
           if (parse < 0)