(no commit message)

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 12277cd1f8d62135f1784b9f72612c3252b6e056..7112e4133ebcbaf0ec60cf815a7cad48a5e347c1 100644 (file)
--- 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 8210d1390678280f19f7f2c1fd1fc60e89812cbc..6f30d1202dfe37db3580416c04a2b38f74f53b7d 100644 (file)
--- 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 1cdee08b6bd24ca92a0a1f5b8e24c2e66546e2f9..d5ee46045650171abdf5667e005b5227c2950d78 100644 (file)
--- 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))
       {