From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 11 Jul 2012 11:56:03 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5278
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63725a609713eb8238ea3c8c47958d22b0106c27;p=imagemagick

---

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 64f5afb8b..09fb02522 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -578,9 +578,14 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
   assert(composite_image->signature == MagickSignature);
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
-  if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
-      (IsGrayColorspace(composite_image->colorspace) == MagickFalse))
-    (void) TransformImageColorspace(image,sRGBColorspace,exception);
+  if (IsGrayColorspace(image->colorspace) != MagickFalse)
+    {
+      if (IsGrayColorspace(composite_image->colorspace) != MagickFalse)
+        (void) SetImageColorspace(image,RGBColorspace,exception);
+      else
+        (void) TransformImageColorspace(image,composite_image->colorspace,
+          exception);
+    }
   if ((compose == OverCompositeOp) || (compose == SrcOverCompositeOp))
     {
       status=CompositeOverImage(image,composite_image,clip_to_self,x_offset,