From bc4a1d43fd52e717ef36a17ef41dcf4d1cd8f274 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 15 Dec 2014 21:47:00 +0000 Subject: [PATCH] --- coders/aai.c | 2 +- coders/avs.c | 2 +- coders/mtv.c | 4 ++-- coders/sixel.c | 2 +- coders/yuv.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coders/aai.c b/coders/aai.c index bc31f6f81..66f0c702b 100644 --- a/coders/aai.c +++ b/coders/aai.c @@ -373,7 +373,7 @@ static MagickBooleanType WriteAAIImage(const ImageInfo *image_info,Image *image, /* Allocate memory for pixels. */ - pixels=(unsigned char *) AcquireQuantumMemory((size_t) image->columns, + pixels=(unsigned char *) AcquireQuantumMemory(image->columns, 4*sizeof(*pixels)); if (pixels == (unsigned char *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); diff --git a/coders/avs.c b/coders/avs.c index 4e28d5fca..a88c102ea 100644 --- a/coders/avs.c +++ b/coders/avs.c @@ -369,7 +369,7 @@ static MagickBooleanType WriteAVSImage(const ImageInfo *image_info,Image *image, /* Allocate memory for pixels. */ - pixels=(unsigned char *) AcquireQuantumMemory((size_t) image->columns, + pixels=(unsigned char *) AcquireQuantumMemory(image->columns, 4*sizeof(*pixels)); if (pixels == (unsigned char *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); diff --git a/coders/mtv.c b/coders/mtv.c index 0036bbc65..3778de359 100644 --- a/coders/mtv.c +++ b/coders/mtv.c @@ -164,7 +164,7 @@ static Image *ReadMTVImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Convert MTV raster image to pixel packets. */ - pixels=(unsigned char *) AcquireQuantumMemory((size_t) image->columns, + pixels=(unsigned char *) AcquireQuantumMemory(image->columns, 3UL*sizeof(*pixels)); if (pixels == (unsigned char *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); @@ -370,7 +370,7 @@ static MagickBooleanType WriteMTVImage(const ImageInfo *image_info,Image *image, Allocate memory for pixels. */ (void) TransformImageColorspace(image,sRGBColorspace,exception); - pixels=(unsigned char *) AcquireQuantumMemory((size_t) image->columns, + pixels=(unsigned char *) AcquireQuantumMemory(image->columns, 3UL*sizeof(*pixels)); if (pixels == (unsigned char *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); diff --git a/coders/sixel.c b/coders/sixel.c index f903081f9..7a9b7442a 100644 --- a/coders/sixel.c +++ b/coders/sixel.c @@ -1281,7 +1281,7 @@ static MagickBooleanType WriteSIXELImage(const ImageInfo *image_info,Image *imag Define SIXEL pixels. */ output = sixel_output_create(image); - sixel_pixels =(unsigned char *) AcquireQuantumMemory((size_t) image->columns * image->rows,1); + sixel_pixels =(unsigned char *) AcquireQuantumMemory(image->columns * image->rows,1); for (y=0; y < (ssize_t) image->rows; y++) { q=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/yuv.c b/coders/yuv.c index 3ad280a50..5b571baa5 100644 --- a/coders/yuv.c +++ b/coders/yuv.c @@ -197,7 +197,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception) scanline=(unsigned char *) AcquireQuantumMemory((size_t) 2UL* image->columns+2UL,quantum*sizeof(*scanline)); else - scanline=(unsigned char *) AcquireQuantumMemory((size_t) image->columns, + scanline=(unsigned char *) AcquireQuantumMemory(image->columns, quantum*sizeof(*scanline)); if (scanline == (unsigned char *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); -- 2.40.0