From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 13 May 2012 22:22:59 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5598
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdbf4b6badc87b831f515e4453ebc8bbff1fcec0;p=imagemagick

---

diff --git a/MagickCore/quantum.c b/MagickCore/quantum.c
index 223f2eee8..0f7c21151 100644
--- a/MagickCore/quantum.c
+++ b/MagickCore/quantum.c
@@ -508,13 +508,12 @@ MagickExport QuantumType GetQuantumType(Image *image,ExceptionInfo *exception)
       if (image->matte != MagickFalse)
         quantum_type=GrayAlphaQuantum;
     }
-  else
-    if (image->storage_class == PseudoClass)
-      {
-        quantum_type=IndexQuantum;
-        if (image->matte != MagickFalse)
-          quantum_type=IndexAlphaQuantum;
-      }
+  if (image->storage_class == PseudoClass)
+    {
+      quantum_type=IndexQuantum;
+      if (image->matte != MagickFalse)
+        quantum_type=IndexAlphaQuantum;
+    }
   return(quantum_type);
 }
 
diff --git a/coders/miff.c b/coders/miff.c
index bb29292bd..d852c581a 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -1265,18 +1265,18 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
         if (image->matte != MagickFalse)
           quantum_type=CMYKAQuantum;
       }
-    if (image->storage_class == PseudoClass)
-      {
-        quantum_type=IndexQuantum;
-        if (image->matte != MagickFalse)
-          quantum_type=IndexAlphaQuantum;
-      }
     if (IsGrayColorspace(image->colorspace) != MagickFalse)
       {
         quantum_type=GrayQuantum;
         if (image->matte != MagickFalse)
           quantum_type=GrayAlphaQuantum;
       }
+    if (image->storage_class == PseudoClass)
+      {
+        quantum_type=IndexQuantum;
+        if (image->matte != MagickFalse)
+          quantum_type=IndexAlphaQuantum;
+      }
     status=MagickTrue;
     switch (image->compression)
     {