(no commit message)

diff --git a/coders/cin.c b/coders/cin.c
index 16e832c9d40ebd7597d8b139d219cfc6bfe44780..22656e3140aa3e0571df75fdc1ccea3e75a7a2a6 100644 (file)
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -81,7 +81,7 @@ typedef struct _CINDataFormatInfo
     sign,
     sense;
 
-  unsigned int
+  size_t
     line_pad,
     channel_pad;
 
@@ -91,7 +91,7 @@ typedef struct _CINDataFormatInfo
 
 typedef struct _CINFileInfo
 {
-  unsigned int
+  size_t
     magic,
     image_offset,
     generic_length,
@@ -115,14 +115,14 @@ typedef struct _CINFilmInfo
     offset,
     reserve1;
 
-  unsigned int
+  size_t
     prefix,
     count;
 
   char
     format[32];
 
-  unsigned int
+  size_t
     frame_position;
 
   float
@@ -141,7 +141,7 @@ typedef struct _CINImageChannel
     bits_per_pixel,
     reserve;
 
-  unsigned int
+  size_t
     pixels_per_line,
     lines_per_image;
 
@@ -175,7 +175,7 @@ typedef struct _CINImageInfo
 
 typedef struct _CINOriginationInfo
 {
-  int
+  ssize_t
     x_offset,
     y_offset;
 
@@ -909,7 +909,7 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image)
   (void) ResetMagickMemory(&cin,0,sizeof(cin));
   offset=0;
   cin.file.magic=0x802A5FD7UL;
-  offset+=WriteBlobLong(image,cin.file.magic);
+  offset+=WriteBlobLong(image,(unsigned int) cin.file.magic);
   cin.file.image_offset=0x800;
   profile=GetImageProfile(image,"cin:user.data");
   if (profile != (StringInfo *) NULL)
@@ -917,20 +917,20 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image)
       cin.file.image_offset+=(size_t) GetStringInfoLength(profile);
       cin.file.image_offset=(((cin.file.image_offset+0x2000-1)/0x2000)*0x2000);
     }
-  offset+=WriteBlobLong(image,cin.file.image_offset);
+  offset+=WriteBlobLong(image,(unsigned int) cin.file.image_offset);
   cin.file.generic_length=0x400;
-  offset+=WriteBlobLong(image,cin.file.generic_length);
+  offset+=WriteBlobLong(image,(unsigned int) cin.file.generic_length);
   cin.file.industry_length=0x400;
-  offset+=WriteBlobLong(image,cin.file.industry_length);
+  offset+=WriteBlobLong(image,(unsigned int) cin.file.industry_length);
   cin.file.user_length=0x00;
   if (profile != (StringInfo *) NULL)
     {
       cin.file.user_length+=(size_t) GetStringInfoLength(profile);
       cin.file.user_length=(((cin.file.user_length+0x2000-1)/0x2000)*0x2000);
     }
-  offset+=WriteBlobLong(image,cin.file.user_length);
+  offset+=WriteBlobLong(image,(unsigned int) cin.file.user_length);
   cin.file.file_size=4*image->columns*image->rows+0x2000;
-  offset+=WriteBlobLong(image,cin.file.file_size);
+  offset+=WriteBlobLong(image,(unsigned int) cin.file.file_size);
   (void) CopyMagickString(cin.file.version,"V4.5",sizeof(cin.file.version));
   offset+=WriteBlob(image,sizeof(cin.file.version),(unsigned char *)
     cin.file.version);
@@ -974,9 +974,11 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image)
     offset+=WriteBlobByte(image,cin.image.channel[0].bits_per_pixel);
     offset+=WriteBlobByte(image,cin.image.channel[0].reserve);
     cin.image.channel[i].pixels_per_line=image->columns;
-    offset+=WriteBlobLong(image,cin.image.channel[0].pixels_per_line);
+    offset+=WriteBlobLong(image,(unsigned int)
+      cin.image.channel[0].pixels_per_line);
     cin.image.channel[i].lines_per_image=image->rows;
-    offset+=WriteBlobLong(image,cin.image.channel[0].lines_per_image);
+    offset+=WriteBlobLong(image,(unsigned int)
+      cin.image.channel[0].lines_per_image);
     cin.image.channel[i].min_data=0;
     offset+=WriteBlobFloat(image,cin.image.channel[0].min_data);
     cin.image.channel[i].min_quantity=0.0;
@@ -1014,9 +1016,9 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image)
   cin.data_format.sense=0; /* image sense: positive image */
   offset+=WriteBlobByte(image,cin.data_format.sense);
   cin.data_format.line_pad=0;
-  offset+=WriteBlobLong(image,cin.data_format.line_pad);
+  offset+=WriteBlobLong(image,(unsigned int) cin.data_format.line_pad);
   cin.data_format.channel_pad=0;
-  offset+=WriteBlobLong(image,cin.data_format.channel_pad);
+  offset+=WriteBlobLong(image,(unsigned int) cin.data_format.channel_pad);
   offset+=WriteBlob(image,sizeof(cin.data_format.reserve),(unsigned char *)
     cin.data_format.reserve);
   /*
@@ -1105,12 +1107,12 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image)
   value=GetCINProperty(image_info,image,"cin:film.prefix");
   if (value != (const char *) NULL)
     cin.film.prefix=StringToUnsignedLong(value);
-  offset+=WriteBlobLong(image,cin.film.prefix);
+  offset+=WriteBlobLong(image,(unsigned int) cin.film.prefix);
   cin.film.count=0UL;
   value=GetCINProperty(image_info,image,"cin:film.count");
   if (value != (const char *) NULL)
     cin.film.count=StringToUnsignedLong(value);
-  offset+=WriteBlobLong(image,cin.film.count);
+  offset+=WriteBlobLong(image,(unsigned int) cin.film.count);
   value=GetCINProperty(image_info,image,"cin:film.format");
   if (value != (const char *) NULL)
     (void) CopyMagickString(cin.film.format,value,sizeof(cin.film.format));
@@ -1120,7 +1122,7 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image)
   value=GetCINProperty(image_info,image,"cin:film.frame_position");
   if (value != (const char *) NULL)
     cin.film.frame_position=StringToUnsignedLong(value);
-  offset+=WriteBlobLong(image,cin.film.frame_position);
+  offset+=WriteBlobLong(image,(unsigned int) cin.film.frame_position);
   cin.film.frame_rate=0.0f;
   value=GetCINProperty(image_info,image,"cin:film.frame_rate");
   if (value != (const char *) NULL)

diff --git a/coders/dib.c b/coders/dib.c
index 8eabe2008689403fe5f6b20e668ab53bb136d77e..f1322547068e567586b819a7306022395387e57a 100644 (file)
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -71,10 +71,10 @@
 */
 typedef struct _DIBInfo
 {
-  unsigned int
+  size_t
     size;
 
-  int
+  ssize_t
     width,
     height;
 
@@ -82,7 +82,7 @@ typedef struct _DIBInfo
     planes,
     bits_per_pixel;
 
-  unsigned int
+  size_t
     compression,
     image_size,
     x_pixels,
@@ -94,7 +94,7 @@ typedef struct _DIBInfo
     alpha_mask,
     colors_important;
 
-  int
+  ssize_t
     colorspace;
 
   PointInfo
@@ -1162,7 +1162,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
           *q++=(unsigned char)(word >> 8);
           p++;
         }
-        for (x=2L*image->columns; x < (ssize_t) bytes_per_line; x++)
+        for (x=(ssize_t) (2*image->columns); x < (ssize_t) bytes_per_line; x++)
           *q++=0x00;
         status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
                 image->rows);
@@ -1193,7 +1193,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
           p++;
         }
         if (dib_info.bits_per_pixel == 24)
-          for (x=3L*image->columns; x < (ssize_t) bytes_per_line; x++)
+          for (x=(ssize_t) (3*image->columns); x < (ssize_t) bytes_per_line; x++)
             *q++=0x00;
         status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
                 image->rows);
@@ -1229,17 +1229,17 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
   /*
     Write DIB header.
   */
-  (void) WriteBlobLSBLong(image,dib_info.size);
+  (void) WriteBlobLSBLong(image,(unsigned int) dib_info.size);
   (void) WriteBlobLSBLong(image,dib_info.width);
   (void) WriteBlobLSBLong(image,(unsigned short) dib_info.height);
   (void) WriteBlobLSBShort(image,(unsigned short) dib_info.planes);
   (void) WriteBlobLSBShort(image,dib_info.bits_per_pixel);
-  (void) WriteBlobLSBLong(image,dib_info.compression);
-  (void) WriteBlobLSBLong(image,dib_info.image_size);
-  (void) WriteBlobLSBLong(image,dib_info.x_pixels);
-  (void) WriteBlobLSBLong(image,dib_info.y_pixels);
-  (void) WriteBlobLSBLong(image,dib_info.number_colors);
-  (void) WriteBlobLSBLong(image,dib_info.colors_important);
+  (void) WriteBlobLSBLong(image,(unsigned int) dib_info.compression);
+  (void) WriteBlobLSBLong(image,(unsigned int) dib_info.image_size);
+  (void) WriteBlobLSBLong(image,(unsigned int) dib_info.x_pixels);
+  (void) WriteBlobLSBLong(image,(unsigned int) dib_info.y_pixels);
+  (void) WriteBlobLSBLong(image,(unsigned int) dib_info.number_colors);
+  (void) WriteBlobLSBLong(image,(unsigned int) dib_info.colors_important);
   if (image->storage_class == PseudoClass)
     {
       if (dib_info.bits_per_pixel <= 8)

diff --git a/coders/jbig.c b/coders/jbig.c
index 17264074cd4018dc2c431bb0a4ebfcd8e7594360..3d4115fdd5303154133cb60ba2a2ef5439c5a68f 100644 (file)
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -162,7 +162,7 @@ static Image *ReadJBIGImage(const ImageInfo *image_info,
     Initialize JBIG toolkit.
   */
   jbg_dec_init(&jbig_info);
-  jbg_dec_maxsize(&jbig_info,(size_t) image->columns,(size_t)
+  jbg_dec_maxsize(&jbig_info,(unsigned long) image->columns,(unsigned long)
     image->rows);
   image->columns=jbg_dec_getwidth(&jbig_info);
   image->rows=jbg_dec_getheight(&jbig_info);
@@ -495,8 +495,9 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info,
     /*
       Initialize JBIG info structure.
     */
-    jbg_enc_init(&jbig_info,image->columns,image->rows,1,&pixels,
-      (void (*)(unsigned char *,size_t,void *)) JBIGEncode,image);
+    jbg_enc_init(&jbig_info,(unsigned long) image->columns,(unsigned long)
+      image->rows,1,&pixels,(void (*)(unsigned char *,size_t,void *))
+      JBIGEncode,image);
     if (image_info->scene != 0)
       jbg_enc_layers(&jbig_info,(int) image_info->scene);
     else
@@ -530,7 +531,8 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info,
             x_resolution=(size_t) (100.0*2.54*x_resolution+0.5)/100.0;
             y_resolution=(size_t) (100.0*2.54*y_resolution+0.5)/100.0;
           }
-        (void) jbg_enc_lrlmax(&jbig_info,x_resolution,y_resolution);
+        (void) jbg_enc_lrlmax(&jbig_info,(unsigned long) x_resolution,
+          (unsigned long) y_resolution);
       }
     (void) jbg_enc_lrange(&jbig_info,-1,-1);
     jbg_enc_options(&jbig_info,JBG_ILEAVE | JBG_SMID,JBG_TPDON | JBG_TPBON |

diff --git a/coders/jp2.c b/coders/jp2.c
index eda6af30c47515f4eb9ebf2c4dfd2ae7eedeada7..a0ad25ea3c4c7e00d595e21f88eceb8f559f070f 100644 (file)
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -523,8 +523,8 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
       break;
     for (i=0; i < (ssize_t) number_components; i++)
       (void) jas_image_readcmpt(jp2_image,(short) components[i],0,
-        ((unsigned int) y)/y_step[i],((unsigned int) image->columns)/x_step[i],
-        1,pixels[i]);
+        (jas_image_coord_t) (y/y_step[i]),(jas_image_coord_t) (image->columns/
+        x_step[i]),1,pixels[i]);
     switch (number_components)
     {
       case 1:

diff --git a/coders/mat.c b/coders/mat.c
index 67fe81b1b427897fd20a4d12a5a4f66cebcf50ec..eed591af93cd0d7f377e48be9c5ae299e8da7362 100644 (file)
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -92,20 +92,20 @@ typedef struct
   char identific[124];
   unsigned short Version;
   char EndianIndicator[2];
-  size_t DataType;
-  size_t ObjectSize;
-  size_t unknown1;
-  size_t unknown2;
+  unsigned long DataType;
+  unsigned long ObjectSize;
+  unsigned long unknown1;
+  unsigned long unknown2;
 
   unsigned short unknown5;
   unsigned char StructureFlag;
   unsigned char StructureClass;
-  size_t unknown3;
-  size_t unknown4;
-  size_t DimFlag;
+  unsigned long unknown3;
+  unsigned long unknown4;
+  unsigned long DimFlag;
 
-  size_t SizeX;
-  size_t SizeY;
+  unsigned long SizeX;
+  unsigned long SizeY;
   unsigned short Flag1;
   unsigned short NameFlag;
 }
@@ -1201,15 +1201,15 @@ static MagickBooleanType WriteMATImage(const ImageInfo *image_info,Image *image)
     padding=((unsigned char)(DataSize-1) & 0x7) ^ 0x7;
 
     (void) WriteBlobLSBLong(image, miMATRIX);
-    (void) WriteBlobLSBLong(image, DataSize+padding+(is_gray ? 48l : 56l));
+    (void) WriteBlobLSBLong(image, (unsigned int) DataSize+padding+(is_gray ? 48 : 56));
     (void) WriteBlobLSBLong(image, 0x6); /* 0x88 */
     (void) WriteBlobLSBLong(image, 0x8); /* 0x8C */
     (void) WriteBlobLSBLong(image, 0x6); /* 0x90 */  
     (void) WriteBlobLSBLong(image, 0);   
     (void) WriteBlobLSBLong(image, 0x5); /* 0x98 */
     (void) WriteBlobLSBLong(image, is_gray ? 0x8 : 0xC); /* 0x9C - DimFlag */
-    (void) WriteBlobLSBLong(image, image->rows);    /* x: 0xA0 */  
-    (void) WriteBlobLSBLong(image, image->columns); /* y: 0xA4 */  
+    (void) WriteBlobLSBLong(image, (unsigned int) image->rows);    /* x: 0xA0 */  
+    (void) WriteBlobLSBLong(image, (unsigned int) image->columns); /* y: 0xA4 */  
     if(!is_gray)
     {
       (void) WriteBlobLSBLong(image, 3); /* z: 0xA8 */  
@@ -1219,7 +1219,7 @@ static MagickBooleanType WriteMATImage(const ImageInfo *image_info,Image *image)
     (void) WriteBlobLSBShort(image, 1);  /* 0xB2 */
     (void) WriteBlobLSBLong(image, 'M'); /* 0xB4 */
     (void) WriteBlobLSBLong(image, 0x2); /* 0xB8 */  
-    (void) WriteBlobLSBLong(image, DataSize); /* 0xBC */
+    (void) WriteBlobLSBLong(image, (unsigned int) DataSize); /* 0xBC */
 
     /*
       Store image data.

diff --git a/coders/pdb.c b/coders/pdb.c
index db569c2d9b2c5f846fa201f81eb54d2210f47cfc..79d4c839d2ee0d2be34f0052fb48631b7ca3cdb7 100644 (file)
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -898,7 +898,7 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image)
   /*
     Write the Image record header.
   */
-  (void) WriteBlobMSBLong(image,(size_t)
+  (void) WriteBlobMSBLong(image,(unsigned int)
     (TellBlob(image)+8*pdb_info.number_records));
   (void) WriteBlobByte(image,0x40);
   (void) WriteBlobByte(image,0x6f);
@@ -909,7 +909,7 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image)
       /*
         Write the comment record header.
       */
-      (void) WriteBlobMSBLong(image,(size_t) (TellBlob(image)+8+58+q-
+      (void) WriteBlobMSBLong(image,(unsigned int) (TellBlob(image)+8+58+q-
         runlength));
       (void) WriteBlobByte(image,0x40);
       (void) WriteBlobByte(image,0x6f);

diff --git a/coders/tiff.c b/coders/tiff.c
index 18a769d7e497b1a1e8bfd51d5c416e91099ffbfe..46fcc810cb247d18bd449461b4501bde72ae8161 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2241,7 +2241,7 @@ static void TIFFSetProfiles(TIFF *tiff,Image *image)
         SetStringInfoLength(iptc_profile,length);
         if (TIFFIsByteSwapped(tiff))
           TIFFSwabArrayOfLong((uint32 *) GetStringInfoDatum(iptc_profile),
-            (size_t) (length/4));
+            (unsigned long) (length/4));
         (void) TIFFSetField(tiff,TIFFTAG_RICHTIFFIPTC,(uint32)
           GetStringInfoLength(iptc_profile)/4,GetStringInfoDatum(iptc_profile));
         iptc_profile=DestroyStringInfo(iptc_profile);
@@ -2759,8 +2759,8 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
         (void) TIFFSetField(tiff,TIFFTAG_PLANARCONFIG,PLANARCONFIG_SEPARATE);
     rows_per_strip=1;
     if (TIFFScanlineSize(tiff) != 0)
-      rows_per_strip=(size_t) MagickMax((size_t)
-        TIFFDefaultStripSize(tiff,0),1);
+      rows_per_strip=(uint32) MagickMax((size_t) TIFFDefaultStripSize(tiff,0),
+        1);
     option=GetImageOption(image_info,"tiff:rows-per-strip");
     if (option != (const char *) NULL)
       rows_per_strip=(size_t) strtol(option,(char **) NULL,10);
@@ -2817,16 +2817,16 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
       }
       case COMPRESSION_ADOBE_DEFLATE:
       {
-        rows_per_strip=image->rows;
+        rows_per_strip=(uint32) image->rows;
         (void) TIFFGetFieldDefaulted(tiff,TIFFTAG_BITSPERSAMPLE,
           &bits_per_sample);
         if (((photometric == PHOTOMETRIC_RGB) ||
              (photometric == PHOTOMETRIC_MINISBLACK)) &&
             ((bits_per_sample == 8) || (bits_per_sample == 16)))
           (void) TIFFSetField(tiff,TIFFTAG_PREDICTOR,2);
-        (void) TIFFSetField(tiff,TIFFTAG_ZIPQUALITY,image_info->quality ==
-          UndefinedCompressionQuality ? 7 : (long) MagickMin(1L*
-          image_info->quality/10,9));
+        (void) TIFFSetField(tiff,TIFFTAG_ZIPQUALITY,(long) (
+          image_info->quality == UndefinedCompressionQuality ? 7 :
+          MagickMin(1*image_info->quality/10,9)));
         break;
       }
       case COMPRESSION_CCITTFAX3:

diff --git a/coders/viff.c b/coders/viff.c
index 8f037ab45484235eb344793970504d47bf1ee5bb..acb1f949a18c4966bd9b3942c37500fb62140233 100644 (file)
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -1050,27 +1050,27 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
     (void) WriteBlob(image,512,(unsigned char *) viff_info.comment);
     (void) WriteBlobMSBLong(image,viff_info.rows);
     (void) WriteBlobMSBLong(image,viff_info.columns);
-    (void) WriteBlobMSBLong(image,viff_info.subrows);
-    (void) WriteBlobMSBLong(image,(size_t) viff_info.x_offset);
-    (void) WriteBlobMSBLong(image,(size_t) viff_info.y_offset);
+    (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);
     viff_info.x_bits_per_pixel=1U*(63 << 24) | (128 << 16);
-    (void) WriteBlobMSBLong(image,(size_t) viff_info.x_bits_per_pixel);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.x_bits_per_pixel);
     viff_info.y_bits_per_pixel=1U*(63 << 24) | (128 << 16);
-    (void) WriteBlobMSBLong(image,(size_t) viff_info.y_bits_per_pixel);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.y_bits_per_pixel);
     (void) WriteBlobMSBLong(image,viff_info.location_type);
     (void) WriteBlobMSBLong(image,viff_info.location_dimension);
-    (void) WriteBlobMSBLong(image,viff_info.number_of_images);
-    (void) WriteBlobMSBLong(image,viff_info.number_data_bands);
-    (void) WriteBlobMSBLong(image,viff_info.data_storage_type);
-    (void) WriteBlobMSBLong(image,viff_info.data_encode_scheme);
-    (void) WriteBlobMSBLong(image,viff_info.map_scheme);
-    (void) WriteBlobMSBLong(image,viff_info.map_storage_type);
-    (void) WriteBlobMSBLong(image,viff_info.map_rows);
-    (void) WriteBlobMSBLong(image,viff_info.map_columns);
-    (void) WriteBlobMSBLong(image,viff_info.map_subrows);
-    (void) WriteBlobMSBLong(image,viff_info.map_enable);
-    (void) WriteBlobMSBLong(image,viff_info.maps_per_cycle);
-    (void) WriteBlobMSBLong(image,viff_info.color_space_model);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.number_of_images);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.number_data_bands);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.data_storage_type);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.data_encode_scheme);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.map_scheme);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.map_storage_type);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.map_rows);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.map_columns);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.map_subrows);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.map_enable);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.maps_per_cycle);
+    (void) WriteBlobMSBLong(image,(unsigned int) viff_info.color_space_model);
     for (i=0; i < 420; i++)
       (void) WriteBlobByte(image,'\0');
     /*