From 0e274112f2ad0a61de63adfc11e3e78038d55231 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 25 Mar 2014 14:09:19 +0000 Subject: [PATCH] --- MagickWand/mogrify.c | 4 ++-- coders/psd.c | 12 ++++++------ coders/tiff.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 12277cd1f..7112e4133 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -7131,12 +7131,12 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info, } if (LocaleCompare("seed",option+1) == 0) { - size_t + unsigned long seed; if (*option == '+') { - seed=(size_t) time((time_t *) NULL); + seed=(unsigned long) time((time_t *) NULL); SetRandomSecretKey(seed); break; } diff --git a/coders/psd.c b/coders/psd.c index 8210d1390..6f30d1202 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -944,9 +944,9 @@ static MagickStatusType ReadPSDChannelZip(Image *image, (void) ReadBlob(image,compact_size,compact_pixels); stream.next_in=(Bytef *)compact_pixels; - stream.avail_in=compact_size; + stream.avail_in=(unsigned int) compact_size; stream.next_out=(Bytef *)pixels; - stream.avail_out=count; + stream.avail_out=(unsigned int) count; if(inflateInit(&stream) == Z_OK) { @@ -2638,10 +2638,10 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image, next_image->compression=NoCompression; (void) WriteBlobMSBLong(image,(unsigned int) next_image->page.y); (void) WriteBlobMSBLong(image,(unsigned int) next_image->page.x); - (void) WriteBlobMSBLong(image,(unsigned int) next_image->page.y+ - next_image->rows); - (void) WriteBlobMSBLong(image,(unsigned int) next_image->page.x+ - next_image->columns); + (void) WriteBlobMSBLong(image,(unsigned int) (next_image->page.y+ + next_image->rows)); + (void) WriteBlobMSBLong(image,(unsigned int) (next_image->page.x+ + next_image->columns)); packet_size=next_image->depth > 8 ? 2UL : 1UL; channel_size=(unsigned int) ((packet_size*next_image->rows* next_image->columns)+2); diff --git a/coders/tiff.c b/coders/tiff.c index 1cdee08b6..d5ee46045 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -3279,7 +3279,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, if (rows_per_strip < 1) rows_per_strip=1; if ((image->rows/rows_per_strip) >= (1UL << 15)) - rows_per_strip=(image->rows >> 15); + rows_per_strip=(uint32) (image->rows >> 15); (void) TIFFSetField(tiff,TIFFTAG_ROWSPERSTRIP,rows_per_strip); if ((image->resolution.x != 0.0) && (image->resolution.y != 0.0)) { -- 2.40.0