QuantumInfo
*quantum_info;
- quantum_info=(QuantumInfo *) AcquireAlignedMemory(1,sizeof(*quantum_info));
+ quantum_info=(QuantumInfo *) AcquireMagickMemory(sizeof(*quantum_info));
if (quantum_info == (QuantumInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
quantum_info->signature=MagickSignature;
return(MagickFalse);
quantum_info->extent=extent;
(void) ResetMagickMemory(quantum_info->pixels,0,
- sizeof(*quantum_info->pixels));
+ 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,
register ssize_t
i;
+ ssize_t
+ extent;
+
assert(quantum_info != (QuantumInfo *) NULL);
assert(quantum_info->signature == MagickSignature);
assert(quantum_info->pixels != (unsigned char **) NULL);
+ extent=(ssize_t) quantum_info->extent;
for (i=0; i < (ssize_t) quantum_info->number_threads; i++)
- {
- /*
- Did we overrun our quantum buffer?
- */
- assert(quantum_info->pixels[i][quantum_info->extent] == QuantumSignature);
- quantum_info->pixels[i]=(unsigned char *) RelinquishMagickMemory(
- quantum_info->pixels[i]);
- }
+ if (quantum_info->pixels[i] != (unsigned char *) NULL)
+ {
+ /*
+ Did we overrun our quantum buffer?
+ */
+ assert(quantum_info->pixels[i][extent] == QuantumSignature);
+ quantum_info->pixels[i]=(unsigned char *) RelinquishMagickMemory(
+ quantum_info->pixels[i]);
+ }
quantum_info->pixels=(unsigned char **) RelinquishMagickMemory(
quantum_info->pixels);
}
return;
option=GetImageOption(image_info,"quantum:format");
if (option != (char *) NULL)
- quantum_info->format=(QuantumFormatType) ParseMagickOption(
+ quantum_info->format=(QuantumFormatType) ParseCommandOption(
MagickQuantumFormatOptions,MagickFalse,option);
option=GetImageOption(image_info,"quantum:minimum");
if (option != (char *) NULL)
*/
MagickExport unsigned char *GetQuantumPixels(const QuantumInfo *quantum_info)
{
- ssize_t
- id;
+ const int
+ id = GetOpenMPThreadId();
assert(quantum_info != (QuantumInfo *) NULL);
assert(quantum_info->signature == MagickSignature);
- id=GetOpenMPThreadId();
return(quantum_info->pixels[id]);
}
\f