From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 8 Apr 2012 22:31:14 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5867
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e21044239250d288f65ac0f7d6b412f07692128;p=imagemagick

---

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 1b5fd1214..0804cd9b4 100644
--- 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,