(no commit message)

[imagemagick] / MagickCore / quantum.c

diff --git a/MagickCore/quantum.c b/MagickCore/quantum.c
index bc28973ddeed319f9ab57941e1552f73fc2ddf87..da705a70e4f8384df0873996746a31354a45b0c7 100644 (file)
--- a/MagickCore/quantum.c
+++ b/MagickCore/quantum.c
@@ -168,7 +168,7 @@ static MagickBooleanType AcquireQuantumPixels(QuantumInfo *quantum_info,
 
   assert(quantum_info != (QuantumInfo *) NULL);
   assert(quantum_info->signature == MagickSignature);
-  quantum_info->number_threads=GetMagickResourceLimit(ThreadResource);
+  quantum_info->number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
   quantum_info->pixels=(unsigned char **) AcquireQuantumMemory(
     quantum_info->number_threads,sizeof(*quantum_info->pixels));
   if (quantum_info->pixels == (unsigned char **) NULL)
@@ -412,11 +412,11 @@ MagickExport void GetQuantumInfo(const ImageInfo *image_info,
   else
     if (quantum_info->minimum == quantum_info->maximum)
       {
-        quantum_info->scale=(MagickRealType) QuantumRange/quantum_info->minimum;
+        quantum_info->scale=(double) QuantumRange/quantum_info->minimum;
         quantum_info->minimum=0.0;
       }
     else
-      quantum_info->scale=(MagickRealType) QuantumRange/(quantum_info->maximum-
+      quantum_info->scale=(double) QuantumRange/(quantum_info->maximum-
         quantum_info->minimum);
   option=GetImageOption(image_info,"quantum:scale");
   if (option != (char *) NULL)
@@ -494,27 +494,26 @@ MagickExport QuantumType GetQuantumType(Image *image,ExceptionInfo *exception)
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   quantum_type=RGBQuantum;
-  if (image->matte != MagickFalse)
+  if (image->alpha_trait == BlendPixelTrait)
     quantum_type=RGBAQuantum;
   if (image->colorspace == CMYKColorspace)
     {
       quantum_type=CMYKQuantum;
-      if (image->matte != MagickFalse)
+      if (image->alpha_trait == BlendPixelTrait)
         quantum_type=CMYKAQuantum;
     }
   if (IsImageGray(image,exception) != MagickFalse)
     {
       quantum_type=GrayQuantum;
-      if (image->matte != MagickFalse)
+      if (image->alpha_trait == BlendPixelTrait)
         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->alpha_trait == BlendPixelTrait)
+        quantum_type=IndexAlphaQuantum;
+    }
   return(quantum_type);
 }
 \f