From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 10 Aug 2017 20:24:13 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.6-6~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33c2dddef99486e2f2bf4c857a731323047ed539;p=imagemagick

...
---

diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index 879afe7a7..c05566e6f 100644
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -516,8 +516,13 @@ MagickExport Image *CombineImages(const Image *image,
       combine_image=DestroyImage(combine_image);
       return((Image *) NULL);
     }
-  (void) SetImageColorspace(combine_image,colorspace == UndefinedColorspace ?
-    sRGBColorspace : colorspace,exception);
+  if (colorspace != UndefinedColorspace)
+    (void) SetImageColorspace(combine_image,colorspace,exception);
+  else
+    if (fabs(image->gamma-1.0) <= MagickEpsilon)
+      (void) SetImageColorspace(combine_image,RGBColorspace,exception);
+    else
+      (void) SetImageColorspace(combine_image,sRGBColorspace,exception);
   switch (combine_image->colorspace)
   {
     case UndefinedColorspace: