From: Dirk Lemstra <dirk@git.imagemagick.org>
Date: Thu, 30 Mar 2017 19:18:56 +0000 (+0200)
Subject: Fixed incorrect check when combining images.
X-Git-Tag: 7.0.5-5~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbcf8044f508140ea50d2c9d7a98e5a4b21f777b;p=imagemagick

Fixed incorrect check when combining images.
---

diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index 3f6d1f623..984231c99 100644
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -516,10 +516,8 @@ MagickExport Image *CombineImages(const Image *image,
       combine_image=DestroyImage(combine_image);
       return((Image *) NULL);
     }
-  if ((colorspace == UndefinedColorspace) || (image->number_channels == 1))
-    (void) SetImageColorspace(combine_image,sRGBColorspace,exception);
-  else
-    (void) SetImageColorspace(combine_image,colorspace,exception);
+  (void) SetImageColorspace(combine_image,colorspace == UndefinedColorspace ?
+    sRGBColorspace : colorspace,exception);
   switch (combine_image->colorspace)
   {
     case UndefinedColorspace: