commit 3d6270f32c58286f033e14de9615140a396f6701
author cristy <urban-warrior@git.imagemagick.org> Wed Apr 06 17:55:52 2011 +0000
committer cristy <urban-warrior@git.imagemagick.org> Wed Apr 06 17:55:52 2011 +0000
tree 1866fa6b215d3016d76774ad3035e348667458a9
parent db60568e12574785101a4ae8d8da076227a0a889

magick/quantize.c

diff --git a/magick/quantize.c b/magick/quantize.c
index 7fd763c..303fa60 100644
--- a/magick/quantize.c
+++ b/magick/quantize.c
@@ -2686,11 +2686,14 @@
     maximum_colors=MaxColormapSize;
   if (maximum_colors > MaxColormapSize)
     maximum_colors=MaxColormapSize;
-  if ((image->columns*image->rows) <= maximum_colors)
-    return(DirectToColormapImage(image,&image->exception));
-  if ((IsGrayImage(image,&image->exception) != MagickFalse) &&
-      (image->matte == MagickFalse))
-    (void) SetGrayscaleImage(image);
+  if (IsGrayImage(image,&image->exception) != MagickFalse)
+    {
+      if (image->matte == MagickFalse)
+        (void) SetGrayscaleImage(image);
+      else
+        if ((image->columns*image->rows) <= maximum_colors)
+          return(DirectToColormapImage(image,&image->exception));
+    }
   if ((image->storage_class == PseudoClass) &&
       (image->colors <= maximum_colors))
     return(MagickTrue);