(no commit message)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 1b5fd1214469252cd5c2057d23ec50e21c7091bf..0804cd9b41c8a37e7ad9048218cdbf4cbd1986a1 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -578,6 +578,9 @@ 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 ((compose == OverCompositeOp) || (compose == SrcOverCompositeOp))
     {
       status=CompositeOverImage(image,composite_image,clip_to_self,x_offset,