From: cristy Date: Sun, 30 May 2010 01:59:46 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9351 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b29b25525c4612c77b1b3c8abcc40685d0aa33f;p=imagemagick --- diff --git a/coders/bmp.c b/coders/bmp.c index 028046ab7..a1220c024 100644 --- a/coders/bmp.c +++ b/coders/bmp.c @@ -835,10 +835,14 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) image->matte=bmp_info.alpha_mask != 0 ? MagickTrue : MagickFalse; if ((bmp_info.number_colors != 0) || (bmp_info.bits_per_pixel < 16)) { + size_t + one; + image->storage_class=PseudoClass; image->colors=bmp_info.number_colors; + one=1; if (image->colors == 0) - image->colors=1L << bmp_info.bits_per_pixel; + image->colors=one << bmp_info.bits_per_pixel; } if (image->storage_class == PseudoClass) { diff --git a/coders/braille.c b/coders/braille.c index d3753774a..9dac8e56c 100644 --- a/coders/braille.c +++ b/coders/braille.c @@ -256,7 +256,7 @@ static MagickBooleanType WriteBRAILLEImage(const ImageInfo *image_info, (PixelIntensityToQuantum(&image->colormap[0]) >= PixelIntensityToQuantum(&image->colormap[1])); } - for (y=0; y < (ssize_t) image->rows; y+=cell_height) + for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) cell_height) { if ((y+cell_height) > image->rows) cell_height = (size_t) (image->rows-y); diff --git a/coders/icon.c b/coders/icon.c index ad0e87db1..cf55eaa24 100644 --- a/coders/icon.c +++ b/coders/icon.c @@ -354,12 +354,14 @@ static Image *ReadICONImage(const ImageInfo *image_info, *icon_colormap; size_t - number_colors; + number_colors, + one; /* Read Icon raster colormap. */ - number_colors=1UL << icon_info.bits_per_pixel; + one=1; + number_colors=one << icon_info.bits_per_pixel; if (AcquireImageColormap(image,number_colors) == MagickFalse) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); icon_colormap=(unsigned char *) AcquireQuantumMemory((size_t) @@ -827,8 +829,10 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info, (void) WriteBlobByte(image,icon_file.directory[scene].reserved); (void) WriteBlobLSBShort(image,icon_file.directory[scene].planes); (void) WriteBlobLSBShort(image,icon_file.directory[scene].bits_per_pixel); - (void) WriteBlobLSBLong(image,icon_file.directory[scene].size); - (void) WriteBlobLSBLong(image,icon_file.directory[scene].offset); + (void) WriteBlobLSBLong(image,(unsigned int) + icon_file.directory[scene].size); + (void) WriteBlobLSBLong(image,(unsigned int) + icon_file.directory[scene].offset); scene++; next=SyncNextImageInList(next); } while ((next != (Image *) NULL) && (image_info->adjoin != MagickFalse)); @@ -918,10 +922,14 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info, } else { - icon_info.file_size+=3*(1UL << icon_info.bits_per_pixel); - icon_info.offset_bits+=3*(1UL << icon_info.bits_per_pixel); - icon_info.file_size+=(1UL << icon_info.bits_per_pixel); - icon_info.offset_bits+=(1UL << icon_info.bits_per_pixel); + size_t + one; + + one=1; + icon_info.file_size+=3*(one << icon_info.bits_per_pixel); + icon_info.offset_bits+=3*(one << icon_info.bits_per_pixel); + icon_info.file_size+=(one << icon_info.bits_per_pixel); + icon_info.offset_bits+=(one << icon_info.bits_per_pixel); } } bytes_per_line=(((next->columns*icon_info.bits_per_pixel)+31) & @@ -1217,8 +1225,10 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info, (void) WriteBlobByte(image,icon_file.directory[scene].reserved); (void) WriteBlobLSBShort(image,icon_file.directory[scene].planes); (void) WriteBlobLSBShort(image,icon_file.directory[scene].bits_per_pixel); - (void) WriteBlobLSBLong(image,icon_file.directory[scene].size); - (void) WriteBlobLSBLong(image,icon_file.directory[scene].offset); + (void) WriteBlobLSBLong(image,(unsigned int) + icon_file.directory[scene].size); + (void) WriteBlobLSBLong(image,(unsigned int) + icon_file.directory[scene].offset); scene++; next=SyncNextImageInList(next); } while ((next != (Image *) NULL) && (image_info->adjoin != MagickFalse)); diff --git a/coders/ipl.c b/coders/ipl.c index 1e6f3a0b5..758388af6 100644 --- a/coders/ipl.c +++ b/coders/ipl.c @@ -565,11 +565,11 @@ static MagickBooleanType WriteIPLImage(const ImageInfo *image_info,Image *image) break; } - ipl_info.z = GetImageListLength(image); + ipl_info.z = (unsigned int) GetImageListLength(image); /* There is no current method for detecting whether we have T or Z stacks */ ipl_info.time = 1; - ipl_info.width = image->columns; - ipl_info.height = image->rows; + ipl_info.width = (unsigned int) image->columns; + ipl_info.height = (unsigned int) image->rows; if (image->colorspace != RGBColorspace) (void) TransformImageColorspace(image,RGBColorspace); @@ -577,8 +577,8 @@ static MagickBooleanType WriteIPLImage(const ImageInfo *image_info,Image *image) if(image->colorspace == RGBColorspace) { ipl_info.colors = 3; } else{ ipl_info.colors = 1; } - ipl_info.size = 28 + - ((image->depth)/8)*ipl_info.height*ipl_info.width*ipl_info.colors*ipl_info.z; + ipl_info.size = (unsigned int) (28 + + ((image->depth)/8)*ipl_info.height*ipl_info.width*ipl_info.colors*ipl_info.z); /* Ok! Calculations are done. Lets write this puppy down! */ diff --git a/coders/pcx.c b/coders/pcx.c index 64d4f5c22..fa2942f44 100644 --- a/coders/pcx.c +++ b/coders/pcx.c @@ -1156,7 +1156,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image) ThrowWriterException(CorruptImageError,"ImproperImageHeader"); (void) WriteBlobLSBLong(image,0x3ADE68B1L); for (i=0; i <= (ssize_t) scene; i++) - (void) WriteBlobLSBLong(image,(size_t) page_table[i]); + (void) WriteBlobLSBLong(image,(unsigned int) page_table[i]); page_table=(MagickOffsetType *) RelinquishMagickMemory(page_table); } if (status == MagickFalse) diff --git a/coders/ps.c b/coders/ps.c index 1b3ce5b4d..cdd0988b9 100644 --- a/coders/ps.c +++ b/coders/ps.c @@ -691,7 +691,8 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) count=write(file,command,(unsigned int) strlen(command)); (void) FormatMagickString(translate_geometry,MaxTextExtent, "%g %g translate\n",-bounds.x1,-bounds.y1); - count=write(file,translate_geometry,strlen(translate_geometry)); + count=write(file,translate_geometry,(unsigned int) + strlen(translate_geometry)); file=close(file)-1; /* Render Postscript with the Ghostscript delegate. diff --git a/coders/sgi.c b/coders/sgi.c index e56cd6d3c..e0abc67ed 100644 --- a/coders/sgi.c +++ b/coders/sgi.c @@ -959,7 +959,7 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image) (void) CopyMagickString(iris_info.name,value,sizeof(iris_info.name)); (void) WriteBlob(image,sizeof(iris_info.name),(unsigned char *) iris_info.name); - (void) WriteBlobMSBLong(image,iris_info.pixel_format); + (void) WriteBlobMSBLong(image,(unsigned int) iris_info.pixel_format); (void) WriteBlob(image,sizeof(iris_info.filler),iris_info.filler); /* Allocate SGI pixels. diff --git a/coders/tiff.c b/coders/tiff.c index 46fcc810c..d029806ee 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -2826,7 +2826,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, (void) TIFFSetField(tiff,TIFFTAG_PREDICTOR,2); (void) TIFFSetField(tiff,TIFFTAG_ZIPQUALITY,(long) ( image_info->quality == UndefinedCompressionQuality ? 7 : - MagickMin(1*image_info->quality/10,9))); + MagickMin((ssize_t) image_info->quality/10,9))); break; } case COMPRESSION_CCITTFAX3: diff --git a/coders/viff.c b/coders/viff.c index acb1f949a..b84e7c532 100644 --- a/coders/viff.c +++ b/coders/viff.c @@ -1023,7 +1023,7 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info, viff_info.map_scheme=VFF_MS_ONEPERBAND; viff_info.map_storage_type=VFF_MAPTYP_1_BYTE; viff_info.map_rows=3; - viff_info.map_columns=image->colors; + viff_info.map_columns=(unsigned int) image->colors; } else if (image->colors <= 2) @@ -1048,8 +1048,8 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info, buffer[7]=(unsigned char) viff_info.reserve[2]; (void) WriteBlob(image,8,buffer); (void) WriteBlob(image,512,(unsigned char *) viff_info.comment); - (void) WriteBlobMSBLong(image,viff_info.rows); - (void) WriteBlobMSBLong(image,viff_info.columns); + (void) WriteBlobMSBLong(image,(unsigned int) viff_info.rows); + (void) WriteBlobMSBLong(image,(unsigned int) viff_info.columns); (void) WriteBlobMSBLong(image,(unsigned int) viff_info.subrows); (void) WriteBlobMSBLong(image,(unsigned int) viff_info.x_offset); (void) WriteBlobMSBLong(image,(unsigned int) viff_info.y_offset); diff --git a/coders/wpg.c b/coders/wpg.c index 593ef76a4..dd1e517df 100644 --- a/coders/wpg.c +++ b/coders/wpg.c @@ -1260,7 +1260,11 @@ static Image *ReadWPGImage(const ImageInfo *image_info, if ((image->colors == 0) && (bpp != 24)) { - image->colors=1 << bpp; + size_t + one; + + one=1; + image->colors=one << bpp; if (!AcquireImageColormap(image,image->colors)) goto NoMemory; }