From 62e5ca5376a51ea03b0d08745a8548780b9d0604 Mon Sep 17 00:00:00 2001 From: Cristy Date: Fri, 14 Oct 2016 09:13:32 -0400 Subject: [PATCH] ... --- coders/sgi.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/coders/sgi.c b/coders/sgi.c index 4cb8d9ad3..6b0e9eb5a 100644 --- a/coders/sgi.c +++ b/coders/sgi.c @@ -342,7 +342,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) iris_info.sans=ReadBlobMSBLong(image); count=ReadBlob(image,sizeof(iris_info.name),(unsigned char *) iris_info.name); - if (count != sizeof(iris_info.name)) + if ((size_t) count != sizeof(iris_info.name)) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); iris_info.name[sizeof(iris_info.name)-1]='\0'; if (*iris_info.name != '\0') @@ -351,7 +351,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) if (iris_info.pixel_format != 0) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); count=ReadBlob(image,sizeof(iris_info.filler),iris_info.filler); - if (count != sizeof(iris_info.filler)) + if ((size_t) count != sizeof(iris_info.filler)) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); image->columns=iris_info.columns; image->rows=iris_info.rows; @@ -362,7 +362,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) if (iris_info.depth < 3) { image->storage_class=PseudoClass; - image->colors=iris_info.bytes_per_pixel > 1 ? 65535 : 256; + image->colors=(size_t) (iris_info.bytes_per_pixel > 1 ? 65535 : 256); } if ((image_info->ping != MagickFalse) && (image_info->number_scenes != 0)) if (image->scene >= (image_info->scene+image_info->number_scenes-1)) @@ -461,7 +461,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) } packets=(unsigned char *) GetVirtualMemoryBlob(packet_info); for (i=0; i < (ssize_t) (iris_info.rows*iris_info.depth); i++) - offsets[i]=ReadBlobMSBSignedLong(image); + offsets[i]=(ssize_t) ReadBlobMSBSignedLong(image); for (i=0; i < (ssize_t) (iris_info.rows*iris_info.depth); i++) { runlength[i]=ReadBlobMSBLong(image); @@ -491,7 +491,8 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) if (offset != offsets[y+z*iris_info.rows]) { offset=offsets[y+z*iris_info.rows]; - offset=(ssize_t) SeekBlob(image,(ssize_t) offset,SEEK_SET); + offset=(ssize_t) SeekBlob(image,(MagickOffsetType) offset, + SEEK_SET); } count=ReadBlob(image,(size_t) runlength[y+z*iris_info.rows], packets); @@ -500,7 +501,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) offset+=(ssize_t) runlength[y+z*iris_info.rows]; status=SGIDecode(bytes_per_pixel,(ssize_t) (runlength[y+z*iris_info.rows]/bytes_per_pixel),packets, - 1L*iris_info.columns,p+bytes_per_pixel*z); + (ssize_t) iris_info.columns,p+bytes_per_pixel*z); if (status == MagickFalse) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); p+=(iris_info.columns*4*bytes_per_pixel); @@ -521,7 +522,8 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) if (offset != offsets[y+z*iris_info.rows]) { offset=offsets[y+z*iris_info.rows]; - offset=(ssize_t) SeekBlob(image,(ssize_t) offset,SEEK_SET); + offset=(ssize_t) SeekBlob(image,(MagickOffsetType) offset, + SEEK_SET); } count=ReadBlob(image,(size_t) runlength[y+z*iris_info.rows], packets); @@ -530,7 +532,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) offset+=(ssize_t) runlength[y+z*iris_info.rows]; status=SGIDecode(bytes_per_pixel,(ssize_t) (runlength[y+z*iris_info.rows]/bytes_per_pixel),packets, - 1L*iris_info.columns,p+bytes_per_pixel*z); + (ssize_t) iris_info.columns,p+bytes_per_pixel*z); if (status == MagickFalse) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); } -- 2.40.0