status=SetQuantumDepth(image,quantum_info,image->depth);
if (status == MagickFalse)
quantum_info=DestroyQuantumInfo(quantum_info);
+ quantum_info->endian=image->endian;
return(quantum_info);
}
\f
assert(quantum_info != (QuantumInfo *) NULL);
assert(quantum_info->signature == MagickSignature);
- quantum_info->number_threads=GetOpenMPMaximumThreads();
+ 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)
return(MagickFalse);
quantum_info->extent=extent;
- (void) ResetMagickMemory(quantum_info->pixels,0,
- quantum_info->number_threads*sizeof(*quantum_info->pixels));
+ (void) ResetMagickMemory(quantum_info->pixels,0,quantum_info->number_threads*
+ sizeof(*quantum_info->pixels));
for (i=0; i < (ssize_t) quantum_info->number_threads; i++)
{
quantum_info->pixels[i]=(unsigned char *) AcquireQuantumMemory(extent+1,
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)
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