diff options
Diffstat (limited to 'coders/yuv.c')
| -rw-r--r-- | coders/yuv.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/coders/yuv.c b/coders/yuv.c index 9c5ac55..e754588 100644 --- a/coders/yuv.c +++ b/coders/yuv.c @@ -1,5 +1,5 @@ /* -% Copyright (C) 2003-2018 GraphicsMagick Group +% Copyright (C) 2003-2020 GraphicsMagick Group % Copyright (C) 2002 ImageMagick Studio % Copyright 1991-1999 E. I. du Pont de Nemours and Company % @@ -184,7 +184,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception) Allocate memory for a scanline. */ if (interlace == NoInterlace) - scanline=MagickAllocateMemory(unsigned char *,2*image->columns+2); + scanline=MagickAllocateMemory(unsigned char *,(size_t) 2*image->columns+2); else scanline=MagickAllocateMemory(unsigned char *,image->columns); if (scanline == (unsigned char *) NULL) @@ -213,7 +213,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception) if (interlace == NoInterlace) { if ((y > 0) || (image->previous == (Image *) NULL)) - (void) ReadBlob(image,2*image->columns,scanline); + (void) ReadBlob(image,(size_t)2*image->columns,scanline); p=scanline; q=SetImagePixels(image,0,y,image->columns,1); if (q == (PixelPacket *) NULL) @@ -397,6 +397,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception) image->filename); break; } + StopTimer(&image->timer); /* Proceed to next image. */ @@ -404,7 +405,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception) if (image->scene >= (image_info->subimage+image_info->subrange-1)) break; if (interlace == NoInterlace) - count=ReadBlob(image,2*image->columns,(char *) scanline); + count=ReadBlob(image, (size_t)2*image->columns,(char *) scanline); else count=ReadBlob(image,image->columns,(char *) scanline); if (count != 0) |