From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 6 May 2010 13:44:04 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9548
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd43846202275c3f33515b2c45600467a1f26090;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index 4ea63f090..4e103798d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,12 @@
+2010-05-06  6.6.1-6 Cristy  <quetzlzacatenango@image...>
+  * Do not claim gray colorspace if gray image includes a non-gray pixel.
+
 2010-05-06  6.6.1-6 Anthony Thyssen <A.Thyssen@griffith...>
   * Made use of new no-'sync' channel enabled mathematical compose methods
     for the difference morphology methods.  These should now work correctly
     for specific channels, and more importantally for alpha shaped morphology.
 
-2010-05-05  6.6.1-6 Cristy and Glenn Randers-Pehrson <glennrp@image...>
+2010-05-05  6.6.1-6 Glenn Randers-Pehrson <glennrp@image...>
   * Fixed bugs with losing the opacity channel while writing some PNG images.
     (bug reported by Anthony T.)
 
diff --git a/magick/cache.c b/magick/cache.c
index cdd9a6ce4..4f39ee155 100644
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -2231,6 +2231,8 @@ MagickExport Cache GetImagePixelCache(Image *image,
       */
       image->taint=MagickTrue;
       image->type=UndefinedType;
+      if (image->colorspace == GRAYColorspace)
+        image->colorspace=RGBColorspace;
       if (ValidatePixelCacheMorphology(image) == MagickFalse)
         status=OpenPixelCache(image,IOMode,exception);
     }