From c32a402dea47705ec1a7e31961bb6a27e8c9cb21 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 15 Mar 2013 15:08:09 +0000 Subject: [PATCH] --- MagickCore/quantum.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MagickCore/quantum.c b/MagickCore/quantum.c index 36897c406..e84c428e7 100644 --- a/MagickCore/quantum.c +++ b/MagickCore/quantum.c @@ -128,9 +128,9 @@ MagickExport QuantumInfo *AcquireQuantumInfo(const ImageInfo *image_info, if (image == (const Image *) NULL) return(quantum_info); status=SetQuantumDepth(image,quantum_info,image->depth); + quantum_info->endian=image->endian; if (status == MagickFalse) quantum_info=DestroyQuantumInfo(quantum_info); - quantum_info->endian=image->endian; return(quantum_info); } @@ -678,8 +678,8 @@ MagickExport MagickBooleanType SetQuantumDepth(const Image *image, } if (quantum_info->pixels != (unsigned char **) NULL) DestroyQuantumPixels(quantum_info); - status=AcquireQuantumPixels(quantum_info,(6+quantum_info->pad)*image->columns* - ((quantum_info->depth+7)/8)); /* allow for CMYKA + RLE byte + pad */ + status=AcquireQuantumPixels(quantum_info,(MaxPixelChannels+quantum_info->pad)* + image->columns*((quantum_info->depth+7)/8)); return(status); } -- 2.50.1