(no commit message)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 64f5afb8b8f136ce704da46205c35efeadc1187e..09fb0252250b1f23b17c4ff1375b2fc64b48e48c 100644 (file)
--- 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,