Fixed warnings for 64-bit build on Windows.

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 58bbb2f80695bb985318c94bfcd153b083dca78d..1d30c0847437840b05126fb1c2edd807f382a4aa 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -4234,7 +4234,7 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *restrict cache_info,
   if (nexus_info->authentic_pixel_cache != MagickFalse)
     return(MagickTrue);
   offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns;
-  if ((offset/cache_info->columns) != nexus_info->region.y)
+  if ((offset/(MagickOffsetType) cache_info->columns) != nexus_info->region.y)
     return(MagickFalse);
   offset+=nexus_info->region.x;
   number_channels=cache_info->number_channels;

diff --git a/coders/dib.c b/coders/dib.c
index 13735f7eed2a01d5fd1de05e4f80d468c3120f61..39892a3833ae0e3c8978abc303d1acda5b8d45dc 100644 (file)
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -538,7 +538,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       (dib_info.bits_per_pixel != 24) && (dib_info.bits_per_pixel != 32))
     ThrowReaderException(CorruptImageError,"UnrecognizedBitsPerPixel");
   if (dib_info.bits_per_pixel < 16 &&
-      dib_info.number_colors > (1UL << dib_info.bits_per_pixel))
+      dib_info.number_colors > (size_t) (1UL << dib_info.bits_per_pixel))
     ThrowReaderException(CorruptImageError,"UnrecognizedNumberOfColors");
   if ((dib_info.compression == 1) && (dib_info.bits_per_pixel != 8))
     ThrowReaderException(CorruptImageError,"UnrecognizedBitsPerPixel");

diff --git a/coders/icon.c b/coders/icon.c
index fa3f6e66342453f4ac5cea17cb3ef11e9fb72f00..ed83b1829ea570194bd86798e830683646971d70 100644 (file)
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -576,7 +576,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
               for (x=0; x < (ssize_t) image->columns; x++)
               {
                 byte=(size_t) ReadBlobByte(image);
-                SetPixelIndex(image,byte,q);
+                SetPixelIndex(image,(Quantum) byte,q);
                 q+=GetPixelChannels(image);
               }
               for (x=0; x < (ssize_t) scanline_pad; x++)
@@ -607,7 +607,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
               {
                 byte=(size_t) ReadBlobByte(image);
                 byte|=(size_t) (ReadBlobByte(image) << 8);
-                SetPixelIndex(image,byte,q);
+                SetPixelIndex(image,(Quantum) byte,q);
                 q+=GetPixelChannels(image);
               }
               for (x=0; x < (ssize_t) scanline_pad; x++)

diff --git a/coders/jp2.c b/coders/jp2.c
index 8629497f50aaffb3e0e6bd5053ce63d963b1bc43..fc0232551bd71f4e35de63ab8861a490df49cb42 100644 (file)
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -803,8 +803,8 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
   */
   opj_set_default_encoder_parameters(&parameters);
   for (i=1; i < 6; i++)
-    if (((1 << (i+2)) > (ssize_t) image->columns) &&
-        ((1 << (i+2)) > (ssize_t) image->rows))
+    if (((size_t) (1UL << (i+2)) > image->columns) &&
+        ((size_t) (1UL << (i+2)) > image->rows))
       break;
   parameters.numresolution=i;
   option=GetImageOption(image_info,"jp2:number-resolutions");

diff --git a/coders/sgi.c b/coders/sgi.c
index 100ce7c95b81c107f3a2a3a3d2f7f3528d043a31..84bcadbdffc79dc79203d509b9ebb300c3611f45 100644 (file)
--- a/coders/sgi.c
+++ b/coders/sgi.c
@@ -639,7 +639,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
               {
                 quantum=(*p << 8);
                 quantum|=(*(p+1));
-                SetPixelIndex(image,quantum,q);
+                SetPixelIndex(image,(Quantum) quantum,q);
                 p+=8;
                 q+=GetPixelChannels(image);
               }

diff --git a/coders/stegano.c b/coders/stegano.c
index 8c31b8880225c12a4229549a144916cd1c654bd7..a8c35b1ca4e9663a716474a67d07c2f460821798 100644 (file)
--- a/coders/stegano.c
+++ b/coders/stegano.c
@@ -91,7 +91,7 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info,
   ExceptionInfo *exception)
 {
 #define GetBit(alpha,i) (((size_t) (alpha) >> (size_t) (i)) & 0x01)
-#define SetBit(i,set) SetPixelIndex(image,((set) != 0 ? \
+#define SetBit(i,set) SetPixelIndex(image,(Quantum) ((set) != 0 ? \
   (size_t) GetPixelIndex(image,q) | (one << (size_t) (i)) : \
   (size_t) GetPixelIndex(image,q) & ~(one << (size_t) (i))),q)
 

diff --git a/coders/tiff.c b/coders/tiff.c
index 3aa112c4903ae5639054940854c6929abbaad2b0..022e10df96709437caa313796b2ed5c2b5738879 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2967,7 +2967,7 @@ static void TIFFSetProperties(TIFF *tiff,const ImageInfo *image_info,
         pages;
       
       page=(uint16) image->scene;
-      pages=GetImageListLength(image);
+      pages=(uint16) GetImageListLength(image);
       if ((image_info->adjoin != MagickFalse) && (pages > 1))
         (void) TIFFSetField(tiff,TIFFTAG_SUBFILETYPE,FILETYPE_PAGE);
       (void) TIFFSetField(tiff,TIFFTAG_PAGENUMBER,page,pages);

diff --git a/coders/uil.c b/coders/uil.c
index 85a7803132f9cf4f2c5338f6d6f62380b57d96ce..06f00b98ccb42141e88b5214d7a5f1fe0acfee4d 100644 (file)
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -271,7 +271,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image,
             for (x=0; x < (ssize_t) image->columns; x++)
             {
               if (matte_image[i] != 0)
-                SetPixelIndex(image,image->colors,q);
+                SetPixelIndex(image,(Quantum) image->colors,q);
               q+=GetPixelChannels(image);
             }
           }

diff --git a/coders/viff.c b/coders/viff.c
index 0904294cf91cef7eabbb3c387b9219b29c9b3ad7..1817da0d6459949ba3d35fecd165c3679e4d6a8b 100644 (file)
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -618,7 +618,7 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
               SetPixelGreen(image,quantum == 0 ? 0 : QuantumRange,q);
               SetPixelBlue(image,quantum == 0 ? 0 : QuantumRange,q);
               if (image->storage_class == PseudoClass)
-                SetPixelIndex(image,quantum,q);
+                SetPixelIndex(image,(Quantum) quantum,q);
               q+=GetPixelChannels(image);
             }
             p++;
@@ -632,7 +632,7 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
                 SetPixelGreen(image,quantum == 0 ? 0 : QuantumRange,q);
                 SetPixelBlue(image,quantum == 0 ? 0 : QuantumRange,q);
                 if (image->storage_class == PseudoClass)
-                  SetPixelIndex(image,quantum,q);
+                  SetPixelIndex(image,(Quantum) quantum,q);
                 q+=GetPixelChannels(image);
               }
               p++;