Fixed 64-bit warnings.

diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index e1a2022a28a1540e3ba435da1b1ac01c114af411..64dfc9fa7fa54aa4681d6d875aa1ab22476de3e3 100644 (file)
--- a/MagickCore/distribute-cache.c
+++ b/MagickCore/distribute-cache.c
@@ -230,7 +230,7 @@ static int ConnectPixelCacheServer(const char *hostname,const int port,
         "DistributedPixelCache","'%s'",hostname);
       return(-1);
     }
-  status=connect(client_socket,result->ai_addr,result->ai_addrlen);
+  status=connect(client_socket,result->ai_addr,(socklen_t) result->ai_addrlen);
   if (status == -1)
     {
       (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
@@ -946,7 +946,7 @@ MagickExport void DistributePixelCacheServer(const int port,
         CLOSE_SOCKET(server_socket);
         continue;
       }
-    status=bind(server_socket,p->ai_addr,p->ai_addrlen);
+    status=bind(server_socket,p->ai_addr,(socklen_t) p->ai_addrlen);
     if (status == -1)
       {
         CLOSE_SOCKET(server_socket);

diff --git a/coders/jp2.c b/coders/jp2.c
index 9e8f049a6cb92079793ba4059a7ec2173b7d7755..0f8c9db5fad0ea95ab5ae0288f755e49fc5ea34e 100644 (file)
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -354,9 +354,10 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
       /*
         Extract an area from the image.
       */
-      jp2_status=opj_set_decode_area(jp2_codec,jp2_image,image->extract_info.x,
-        image->extract_info.y,image->extract_info.x+(ssize_t) image->columns,
-        image->extract_info.y+(ssize_t) image->rows);
+      jp2_status=opj_set_decode_area(jp2_codec,jp2_image,
+        (OPJ_INT32) image->extract_info.x,(OPJ_INT32) image->extract_info.y,
+        (OPJ_INT32) (image->extract_info.x+(ssize_t) image->columns),
+        (OPJ_INT32) (image->extract_info.y+(ssize_t) image->rows));
       if (jp2_status == 0)
         {
           opj_stream_destroy(jp2_stream);
@@ -944,8 +945,8 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
   ResetMagickMemory(jp2_info,0,sizeof(jp2_info));
   for (i=0; i < (ssize_t) channels; i++)
   {
-    jp2_info[i].prec=image->depth;
-    jp2_info[i].bpp=image->depth;
+    jp2_info[i].prec=(OPJ_UINT32) image->depth;
+    jp2_info[i].bpp=(OPJ_UINT32) image->depth;
     if ((image->depth == 1) &&
         ((LocaleCompare(image_info->magick,"JPT") == 0) ||
          (LocaleCompare(image_info->magick,"JP2") == 0)))
@@ -956,10 +957,10 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
     jp2_info[i].sgnd=0;
     jp2_info[i].dx=parameters.subsampling_dx;
     jp2_info[i].dy=parameters.subsampling_dy;
-    jp2_info[i].w=image->columns;
-    jp2_info[i].h=image->rows;
+    jp2_info[i].w=(OPJ_UINT32) image->columns;
+    jp2_info[i].h=(OPJ_UINT32) image->rows;
   }
-  jp2_image=opj_image_create(channels,jp2_info,jp2_colorspace);
+  jp2_image=opj_image_create((OPJ_UINT32) channels,jp2_info,jp2_colorspace);
   if (jp2_image == (opj_image_t *) NULL)
     ThrowWriterException(DelegateError,"UnableToEncodeImageFile");
   jp2_image->x0=parameters.image_offset_x0;

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 21688e6b5299d8471f17021f62284077a7a24f69..c2d6a6886e42eb7da7c4580a921d7414868007b9 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -2387,7 +2387,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
               maximum=jpeg_image->quality-1;
             (void) RelinquishUniqueFileResource(jpeg_image->filename);
           }
-          quality=minimum-1;
+          quality=(int)minimum-1;
           jpeg_image=DestroyImage(jpeg_image);
         }
       jpeg_info=DestroyImageInfo(jpeg_info);

diff --git a/coders/rgf.c b/coders/rgf.c
index 21b6dda091dd20311beb7b30876ec993e271ea36..d9aa7ab36af800ef50849b8ecd071762973a0a51 100644 (file)
--- a/coders/rgf.c
+++ b/coders/rgf.c
@@ -374,14 +374,14 @@ static MagickBooleanType WriteRGFImage(const ImageInfo *image_info,Image *image,
           /*
             Write a bitmap byte to the image file.
           */
-          (void) WriteBlobByte(image,byte);
+          (void) WriteBlobByte(image,(unsigned char) byte);
           bit=0;
           byte=0;
         }
       p+=GetPixelChannels(image);
     }
     if (bit != 0)
-      (void) WriteBlobByte(image,byte);
+      (void) WriteBlobByte(image,(unsigned char) byte);
     status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
       image->rows);
     if (status == MagickFalse)

diff --git a/coders/sixel.c b/coders/sixel.c
index cc19b9550fcba8ab3468e450666c5655b6a90828..5f7628d7a81d5eb66cafa9b0eb408e34787e5a3b 100644 (file)
--- a/coders/sixel.c
+++ b/coders/sixel.c
@@ -685,10 +685,11 @@ static MagickBooleanType sixel_encode_impl(unsigned char *pixels, size_t width,s
 
     int x, y, i, n, c;
     int left, right;
-    int len, pix;
+    int pix;
     unsigned char *map;
     sixel_node_t *np, *tp, top;
     int nwrite;
+    size_t len;
 
     context->pos = 0;
 
@@ -816,7 +817,7 @@ static MagickBooleanType sixel_encode_impl(unsigned char *pixels, size_t width,s
                 x = 0;
             }
 
-            x = sixel_put_node(context, x, np, ncolors, keycolor);
+            x = sixel_put_node(context, x, np, (int) ncolors, keycolor);
             sixel_node_del(context, np);
             np = context->node_top;
 
@@ -826,7 +827,7 @@ static MagickBooleanType sixel_encode_impl(unsigned char *pixels, size_t width,s
                     continue;
                 }
 
-                x = sixel_put_node(context, x, np, ncolors, keycolor);
+                x = sixel_put_node(context, x, np, (int) ncolors, keycolor);
                 sixel_node_del(context, np);
                 np = context->node_top;
             }

diff --git a/coders/xbm.c b/coders/xbm.c
index 73d2f770d04045c1266e57452a5a008ee286cb8c..5c3454cd8dc1fad773c894718dd9842b63944d80 100644 (file)
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -334,8 +334,8 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception)
   if (((image->columns % 16) != 0) && ((image->columns % 16) < 9) &&
       (version == 10))
     padding=1;
-  bytes_per_line=(image->columns+7)/8+padding;
-  length=(size_t) image->rows;
+  bytes_per_line=(unsigned int) (image->columns+7)/8+padding;
+  length=(unsigned int) image->rows;
   data=(unsigned char *) AcquireQuantumMemory(length,bytes_per_line*
     sizeof(*data));
   if (data == (unsigned char *) NULL)