]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Fri, 28 May 2010 00:44:52 +0000 (00:44 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Fri, 28 May 2010 00:44:52 +0000 (00:44 +0000)
114 files changed:
coders/art.c
coders/avs.c
coders/bmp.c
coders/braille.c
coders/cin.c
coders/cip.c
coders/cmyk.c
coders/dcm.c
coders/dib.c
coders/dpx.c
coders/fits.c
coders/fpx.c
coders/gray.c
coders/ipl.c
coders/jbig.c
coders/jp2.c
coders/jpeg.c
coders/matte.c
coders/miff.c
coders/mono.c
coders/mtv.c
coders/otb.c
coders/palm.c
coders/pcd.c
coders/pcx.c
coders/pdb.c
coders/pdf.c
coders/pict.c
coders/pix.c
coders/png.c
coders/pnm.c
coders/ps.c
coders/ps2.c
coders/ps3.c
coders/raw.c
coders/rgb.c
coders/rla.c
coders/rle.c
coders/sct.c
coders/sgi.c
coders/sun.c
coders/svg.c
coders/tga.c
coders/tiff.c
coders/tim.c
coders/txt.c
coders/uil.c
coders/uyvy.c
coders/vicar.c
coders/viff.c
coders/wbmp.c
coders/xbm.c
coders/xpm.c
coders/xtrn.c
coders/xwd.c
coders/ycbcr.c
coders/yuv.c
ltdl/argz.c
ltdl/argz_.h
ltdl/lt__alloc.c
ltdl/lt__dirent.c
ltdl/lt__strl.c
ltdl/lt_dlloader.c
ltdl/lt_error.c
ltdl/ltdl.c
ltdl/ltdl.h
ltdl/slist.c
magick/animate.c
magick/composite.c
magick/deprecate.c
magick/display.c
magick/distort.c
magick/draw.c
magick/effect.c
magick/enhance.c
magick/fx.c
magick/hashmap.c
magick/histogram.c
magick/identify.c
magick/layer.c
magick/list.c
magick/magic.c
magick/mime.c
magick/module.c
magick/morphology.c
magick/paint.c
magick/profile.c
magick/property.c
magick/quantize.c
magick/quantum-export.c
magick/resource.c
magick/segment.c
magick/shear.c
magick/threshold.c
magick/token.c
magick/utility.c
magick/xml-tree.c
wand/animate.c
wand/compare.c
wand/composite.c
wand/conjure.c
wand/convert.c
wand/deprecate.c
wand/display.c
wand/drawing-wand.c
wand/identify.c
wand/import.c
wand/magick-image.c
wand/mogrify-private.h
wand/mogrify.c
wand/montage.c
wand/pixel-view.c
wand/stream.c
wand/wandtest.c

index 060a23b6109879bd3ea6a4be3d4cf23751fa5974..72aec52634d69a0ebdcbaf5e007123f74b000a5c 100644 (file)
@@ -341,7 +341,7 @@ static MagickBooleanType WriteARTImage(const ImageInfo *image_info,Image *image)
     if (count != (ssize_t) length)
       ThrowWriterException(CorruptImageError,"UnableToWriteImageData");
     count=WriteBlob(image,(size_t) (-(ssize_t) length) & 0x01,pixels);
-    if (SetImageProgress(image,SaveImageTag,y,image->rows) == MagickFalse)
+    if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
       break;
   }
   quantum_info=DestroyQuantumInfo(quantum_info);
index db04a9e5701cfb9593d931f4074847819953a009..c72650f03cdf96e610867d64c4a34e94120d638f 100644 (file)
@@ -388,7 +388,7 @@ static MagickBooleanType WriteAVSImage(const ImageInfo *image_info,Image *image)
       if (count != (ssize_t) (q-pixels))
         break;
       if ((image->previous == (Image *) NULL) &&
-          (SetImageProgress(image,SaveImageTag,y,image->rows) == MagickFalse))
+          (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse))
         break;
     }
     pixels=(unsigned char *) RelinquishMagickMemory(pixels);
index ac4f53b39780ad83ebbf2afc0158b5a97cef001c..ce3f5d36f207edf195d1082bc7d274e894d7cfc7 100644 (file)
@@ -402,7 +402,8 @@ static size_t EncodeImage(Image *image,const size_t bytes_per_line,
     */
     *q++=(unsigned char) 0x00;
     *q++=(unsigned char) 0x00;
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
@@ -1017,7 +1018,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1057,7 +1059,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1092,7 +1095,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
           offset=(MagickOffsetType) (image->rows-y-1);
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1156,7 +1160,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
           offset=(MagickOffsetType) (image->rows-y-1);
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1188,7 +1193,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
           offset=(MagickOffsetType) (image->rows-y-1);
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1245,7 +1251,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
           offset=(MagickOffsetType) (image->rows-y-1);
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1643,7 +1650,8 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
             *q++=0x00;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1689,7 +1697,8 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
             *q++=0x00;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1714,7 +1723,8 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
             *q++=0x00;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1743,7 +1753,8 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
             *q++=0x00;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1771,7 +1782,8 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image)
           }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
index 49b19933cf4f647d80fe6c6ff2cd492684c9eb95..d0d2dd8ad1556558b1a7c4b8dedc206018997773 100644 (file)
@@ -334,7 +334,8 @@ static MagickBooleanType WriteBRAILLEImage(const ImageInfo *image_info,
     }
     if (!iso_11548_1)
       (void) WriteBlobByte(image,'\n');
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 94407b73f9a7cf9cfd7255abe8f472d38bcb399f..dcd556373fc8ae634a4acc687e929c677eb64fa4 100644 (file)
@@ -728,7 +728,8 @@ static Image *ReadCINImage(const ImageInfo *image_info,
       break;
     if (image->previous == (Image *) NULL)
       {
-        status=SetImageProgress(image,LoadImageTag,y,image->rows);
+        status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
@@ -1169,7 +1170,8 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image)
     count=WriteBlob(image,length,pixels);
     if (count != (ssize_t) length)
       break;
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 40a15829deeb225a7d508fdd1a954c00d4d1637f..739457ccde07b8750d28b6c0928ddcdaa0c929d8 100644 (file)
@@ -256,7 +256,8 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image)
         (void) FormatMagickString(buffer,MaxTextExtent,"%02x",~byte);
         (void) WriteBlobString(image,buffer);
       }
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index da309e4a977b5be380fa534bc81711eff3e35b05..0dba51a0ced9f6a07e0cf5d93d2785b1e3c7a699 100644 (file)
@@ -275,7 +275,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
             }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -371,7 +372,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
           }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1278,7 +1280,8 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1328,7 +1331,8 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
             }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
index 518a38ff1e31b5e2816c1d87ddf0a3b1befdb98f..fff025babe20563fcd3e0df67f1e01021899404e 100644 (file)
@@ -3742,7 +3742,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
               break;
             if (image->previous == (Image *) NULL)
               {
-                status=SetImageProgress(image,LoadImageTag,y,image->rows);
+                status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
                 if (status == MagickFalse)
                   break;
               }
@@ -3897,7 +3898,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
index 485ac0530b8b766335c5c4046c08d38fbba8e548..9ae1748ee99dc81a0d35eb7b8dd708afa20b8e50 100644 (file)
@@ -1105,7 +1105,8 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
            }
         for (x=(ssize_t) (image->columns+7)/8; x < (ssize_t) bytes_per_line; x++)
           *q++=0x00;
-        status=SetImageProgress(image,SaveImageTag,y,image->rows);
+        status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
@@ -1127,7 +1128,8 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
           *q++=(unsigned char) indexes[x];
         for ( ; x < (ssize_t) bytes_per_line; x++)
           *q++=0x00;
-        status=SetImageProgress(image,SaveImageTag,y,image->rows);
+        status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
@@ -1158,7 +1160,8 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
         }
         for (x=2L*image->columns; x < (ssize_t) bytes_per_line; x++)
           *q++=0x00;
-        status=SetImageProgress(image,SaveImageTag,y,image->rows);
+        status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
@@ -1188,7 +1191,8 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image)
         if (dib_info.bits_per_pixel == 24)
           for (x=3L*image->columns; x < (ssize_t) bytes_per_line; x++)
             *q++=0x00;
-        status=SetImageProgress(image,SaveImageTag,y,image->rows);
+        status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
index ce374bb317a5ea12b807e7cb070d9835295168db..971ed93c77bbc23564c6cb4104b205fa33434e34 100644 (file)
@@ -1107,7 +1107,8 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
           MagickBooleanType
             proceed;
 
-          proceed=SetImageProgress(image,LoadImageTag,row,image->rows);
+          proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType) row,
+                image->rows);
           if (proceed == MagickFalse)
             status=MagickFalse;
         }
@@ -1819,7 +1820,8 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image)
     count=WriteBlob(image,extent,pixels);
     if (count != (ssize_t) extent)
       break;
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 75f37060c743a34adec649bfa13ed45c86874f74..c9ce09e02dff0f41bc23f59b4a6df5d8b0bb9079 100644 (file)
@@ -455,7 +455,8 @@ static Image *ReadFITSImage(const ImageInfo *image_info,
         break;
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,LoadImageTag,y,image->rows);
+          status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
@@ -720,7 +721,8 @@ static MagickBooleanType WriteFITSImage(const ImageInfo *image_info,
     count=WriteBlob(image,length,pixels);
     if (count != (ssize_t) length)
       break;
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index f4277deda688a34c7783981411434f2bb24ca481..5fda06bc97b2dfe3304028ae8cd8af8c5dae24a9 100644 (file)
@@ -482,7 +482,8 @@ static Image *ReadFPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
-    status=SetImageProgress(image,LoadImageTag,y,image->rows);
+    status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
@@ -996,7 +997,8 @@ static MagickBooleanType WriteFPXImage(const ImageInfo *image_info,Image *image)
     fpx_status=FPX_WriteImageLine(flashpix,&fpx_info);
     if (fpx_status != FPX_OK)
       break;
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 71e54b441c512b5d7ce78190905be319e56f7495..868d63b538253d076ff5e72b377096da3a1c8d68 100644 (file)
@@ -243,7 +243,8 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
         }
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,LoadImageTag,y,image->rows);
+          status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
@@ -439,7 +440,8 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info,
         break;
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,SaveImageTag,y,image->rows);
+          status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
index 6babdf6a87748787ca6a63dab2050775430b3a4f..ec18f52713e7e3cfaad07e0c772ef6b1d7160b76 100644 (file)
@@ -658,7 +658,8 @@ static MagickBooleanType WriteIPLImage(const ImageInfo *image_info,Image *image)
       (void) WriteBlob(image, image->columns*image->depth/8, pixels);
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,SaveImageTag,y,image->rows);
+          status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
index 846d89aca1e921ee3ce67aaf7096c64162186d8e..17264074cd4018dc2c431bb0a4ebfcd8e7594360 100644 (file)
@@ -243,7 +243,8 @@ static Image *ReadJBIGImage(const ImageInfo *image_info,
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
-    status=SetImageProgress(image,LoadImageTag,y,image->rows);
+    status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
@@ -485,7 +486,8 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info,
         *q++=byte << (8-bit);
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,SaveImageTag,y,image->rows);
+          status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
index 3280c69e79761cad673459c41652071d97ee1bcb..473e5bf36cd711bcd0d21699f3309e8674890620 100644 (file)
@@ -582,7 +582,8 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
-    status=SetImageProgress(image,LoadImageTag,y,image->rows);
+    status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
@@ -941,7 +942,8 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image)
     for (i=0; i < (ssize_t) number_components; i++)
       (void) jas_image_writecmpt(jp2_image,(short) i,0,(unsigned int) y,
         (unsigned int) image->columns,1,pixels[i]);
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 27e11d5293c591647315815fbdfdc931c9f5a35b..1d09810f59cdfc25642a9ad4de189335efbf504f 100644 (file)
@@ -2183,7 +2183,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
             p++;
           }
           (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
-          if (SetImageProgress(image,SaveImageTag,y,image->rows) == MagickFalse)
+          if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
             break;
         }
       else
@@ -2206,7 +2206,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
               p++;
             }
             (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
-            if (SetImageProgress(image,SaveImageTag,y,image->rows) == MagickFalse)
+            if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
               break;
           }
         else
@@ -2242,7 +2242,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
               p++;
             }
             (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
-            if (SetImageProgress(image,SaveImageTag,y,image->rows) == MagickFalse)
+            if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
               break;
           }
     }
@@ -2267,7 +2267,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
           p++;
         }
         (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
-        if (SetImageProgress(image,SaveImageTag,y,image->rows) == MagickFalse)
+        if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
           break;
       }
     else
@@ -2296,7 +2296,8 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
             p++;
           }
           (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
-          status=SetImageProgress(image,SaveImageTag,y,image->rows);
+          status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
@@ -2332,7 +2333,8 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
             p++;
           }
           (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
-          status=SetImageProgress(image,SaveImageTag,y,image->rows);
+          status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
index c7e4783cd7e92d1712f4c9f86992daf7604aa382..eb301c3618219950a31f8dc0cad3b7da20fa0121 100644 (file)
@@ -203,7 +203,8 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info,
     }
     if (SyncAuthenticPixels(matte_image,exception) == MagickFalse)
       break;
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index b4d4cd727670c9de8f5602ef57537cc2607c63f3..399326ee50c4b86e33f730b88088e723ab80eadd 100644 (file)
@@ -2296,9 +2296,13 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
           break;
         }
       }
-      if ((image->previous == (Image *) NULL) &&
-          (SetImageProgress(image,SaveImageTag,y,image->rows) == MagickFalse))
-        break;
+      if (image->previous == (Image *) NULL)
+        {
+          status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+            image->rows);
+          if (status == MagickFalse)
+            break;
+        }
     }
     quantum_info=DestroyQuantumInfo(quantum_info);
     compress_pixels=(unsigned char *) RelinquishMagickMemory(compress_pixels);
index cdef20e349dab2103b05a41bf031e32331819d73..71edd7f1fffae341bc5c434f37f4c6111d337a83 100644 (file)
@@ -184,7 +184,8 @@ static Image *ReadMONOImage(const ImageInfo *image_info,
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
-    status=SetImageProgress(image,LoadImageTag,y,image->rows);
+    status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
@@ -355,7 +356,8 @@ static MagickBooleanType WriteMONOImage(const ImageInfo *image_info,
     }
     if (bit != 0)
       (void) WriteBlobByte(image,(unsigned char) (byte >> (8-bit)));
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 8b8b70512d362cc32a2e34a62f9ab282e15e3d62..8764345bcb0c7225a9b69d4bee0efc2543322381 100644 (file)
@@ -186,7 +186,8 @@ static Image *ReadMTVImage(const ImageInfo *image_info,ExceptionInfo *exception)
         break;
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,LoadImageTag,y,image->rows);
+          status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
@@ -387,7 +388,8 @@ static MagickBooleanType WriteMTVImage(const ImageInfo *image_info,Image *image)
       (void) WriteBlob(image,(size_t) (q-pixels),pixels);
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,SaveImageTag,y,image->rows);
+          status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
index 5102d14db90185dd0c0c22e54b7ccfde73589e88..ea8530a02ea59b4b8d175c5af84f6f7b554d8d4a 100644 (file)
@@ -193,7 +193,8 @@ static Image *ReadOTBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       break;
     if (image->previous == (Image *) NULL)
       {
-        status=SetImageProgress(image,LoadImageTag,y,image->rows);
+        status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
@@ -373,7 +374,8 @@ static MagickBooleanType WriteOTBImage(const ImageInfo *image_info,Image *image)
       (void) WriteBlobByte(image,byte);
     if (image->previous == (Image *) NULL)
       {
-        status=SetImageProgress(image,SaveImageTag,y,image->rows);
+        status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
index 86ca8ef3421ac1ab2ef7005e6a0ebbe139b327de..4c1b04fba7c72b8550d15fcb2924c977811099a8 100644 (file)
@@ -498,7 +498,8 @@ static Image *ReadPALMImage(const ImageInfo *image_info,
         }
         if (image->previous == (Image *) NULL)
           {
-            status=SetImageProgress(image,LoadImageTag,y,image->rows);
+            status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
             if (status == MagickFalse)
               break;
           }
index 664649d2300f8146fcd22b4da8867708816ba626..ddcc5bcfd3c045216b6e963134ec06f5c80d9cba 100644 (file)
@@ -797,7 +797,8 @@ static Image *ReadPCDImage(const ImageInfo *image_info,ExceptionInfo *exception)
       break;
     if (image->previous == (Image *) NULL)
       {
-        status=SetImageProgress(image,LoadImageTag,y,image->rows);
+        status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
index 46b0ba61823d17def7ef90020043c1e750929496..20a27a2c14396261df85e7160c491bbfbbdca4a8 100644 (file)
@@ -617,7 +617,8 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception)
         break;
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,LoadImageTag,y,image->rows);
+          status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
@@ -1041,7 +1042,8 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1063,7 +1065,8 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
               break;
             if (image->previous == (Image *) NULL)
               {
-                status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                 if (status == MagickFalse)
                   break;
               }
@@ -1116,7 +1119,8 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image)
                 break;
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                  status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
index 160a3553be57fa761d0c858d8a39905fd4752581..82801fb815bad7f622d3ea947fdd2e6a92844263 100644 (file)
@@ -451,7 +451,8 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
-        status=SetImageProgress(image,LoadImageTag,y,image->rows);
+        status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
@@ -486,7 +487,8 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
-        status=SetImageProgress(image,LoadImageTag,y,image->rows);
+        status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
@@ -515,7 +517,8 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         }
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
-        status=SetImageProgress(image,LoadImageTag,y,image->rows);
+        status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
@@ -881,7 +884,8 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image)
         buffer[literal+repeat]=0x00;
       }
     }
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 498d5ad73ff684498df62a75fbd9769a7e3014a6..a759b38cef556aba6d4ad94a40321b248a1bcaf1 100644 (file)
@@ -1572,7 +1572,8 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               }
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                  status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
@@ -1614,7 +1615,8 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               }
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                  status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
@@ -1680,7 +1682,8 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               }
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                  status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
@@ -1726,7 +1729,8 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
               }
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                  status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
@@ -1769,7 +1773,8 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                   *q++=(unsigned char) indexes[x];
                 if (image->previous == (Image *) NULL)
                   {
-                    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                     if (status == MagickFalse)
                       break;
                   }
@@ -1808,7 +1813,8 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
                   Ascii85Encode(image,(unsigned char) indexes[x]);
                 if (image->previous == (Image *) NULL)
                   {
-                    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                     if (status == MagickFalse)
                       break;
                   }
index 1430c1c5a487bff33ae663f2d2d96f0d7b56534b..a527ae1fc98eddb4effc43d53055c18876f0a656 100644 (file)
@@ -1889,7 +1889,8 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info,
         packed_scanline);
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,SaveImageTag,y,image->rows);
+          status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
@@ -1943,7 +1944,8 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info,
             packed_scanline);
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
index 5d4be1bcff566cd8c7556c8976f0bb949898c4d0..2ee8bef062aa6527245ad653b69eae877d24d9c2 100644 (file)
@@ -202,7 +202,8 @@ static Image *ReadPIXImage(const ImageInfo *image_info,ExceptionInfo *exception)
         break;
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,LoadImageTag,y,image->rows);
+          status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
index 630e644954ef3a6aedd2627e43939fa1ca49f43c..b87ea6ac84c4bdf4b2121bc1c796fb542a2eddb0 100644 (file)
@@ -2506,7 +2506,8 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
 #endif
         if ((image->previous == (Image *) NULL) && (num_passes == 1))
           {
-            status=SetImageProgress(image,LoadImageTag,y,image->rows);
+            status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
             if (status == MagickFalse)
               break;
           }
@@ -2688,7 +2689,8 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
           break;
         if ((image->previous == (Image *) NULL) && (num_passes == 1))
           {
-            status=SetImageProgress(image,LoadImageTag,y,image->rows);
+            status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
             if (status == MagickFalse)
               break;
           }
index 4d4e45ff5d33a11af9b4dcba9c4740bd0f12ee46..20c7f9e31c4eeebabb5d7f5cf1b2e18199093ff8 100644 (file)
@@ -448,7 +448,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -502,7 +503,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -567,7 +569,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -620,7 +623,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 MagickBooleanType
                   proceed;
 
-                proceed=SetImageProgress(image,LoadImageTag,row,image->rows);
+                proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+                  row,image->rows);
                 if (proceed == MagickFalse)
                   status=MagickFalse;
               }
@@ -696,7 +700,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 MagickBooleanType
                   proceed;
 
-                proceed=SetImageProgress(image,LoadImageTag,row,image->rows);
+                proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType) row,
+                image->rows);
                 if (proceed == MagickFalse)
                   status=MagickFalse;
               }
@@ -805,7 +810,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 MagickBooleanType
                   proceed;
 
-                proceed=SetImageProgress(image,LoadImageTag,row,image->rows);
+                proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType) row,
+                image->rows);
                 if (proceed == MagickFalse)
                   status=MagickFalse;
               }
@@ -984,7 +990,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 MagickBooleanType
                   proceed;
 
-                proceed=SetImageProgress(image,LoadImageTag,row,image->rows);
+                proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType) row,
+                image->rows);
                 if (proceed == MagickFalse)
                   status=MagickFalse;
               }
@@ -1215,7 +1222,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 MagickBooleanType
                   proceed;
 
-                proceed=SetImageProgress(image,LoadImageTag,row,image->rows);
+                proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType) row,
+                image->rows);
                 if (proceed == MagickFalse)
                   status=MagickFalse;
               }
@@ -1665,7 +1673,8 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
           }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1723,7 +1732,8 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
           }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1784,7 +1794,8 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
           }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1822,7 +1833,8 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1904,7 +1916,8 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1977,7 +1990,8 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -2141,7 +2155,8 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -2176,7 +2191,8 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
           (void) WriteBlob(image,extent,pixels);
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
index 059432879a4a36aa5aed3eb30eeb0f997b526c27..230c6b69b62bce755b7dff9b6f1619219d6314df 100644 (file)
@@ -1748,7 +1748,8 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
               }
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                  status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
@@ -1817,7 +1818,8 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                 };
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                  status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
@@ -1889,7 +1891,8 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                   }
                 if (image->previous == (Image *) NULL)
                   {
-                    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                     if (status == MagickFalse)
                       break;
                   }
@@ -1939,7 +1942,8 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                 }
                 if (image->previous == (Image *) NULL)
                   {
-                    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                     if (status == MagickFalse)
                       break;
                   }
@@ -2025,7 +2029,8 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                   MagickMin(length,0xff),q);
                 if (image->previous == (Image *) NULL)
                   {
-                    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                     if (status == MagickFalse)
                       break;
                   }
@@ -2064,7 +2069,8 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
                 }
                 if (image->previous == (Image *) NULL)
                   {
-                    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                     if (status == MagickFalse)
                       break;
                   }
index 958f7a2f098facf960013761f87c1159abc9c0bc..f41c2bf53fee33a70d4ec13afa6067fbdb65fc1b 100644 (file)
@@ -790,7 +790,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                 *q++=ScaleQuantumToChar(PixelIntensityToQuantum(p));
                 p++;
               }
-              progress=SetImageProgress(image,SaveImageTag,y,image->rows);
+              progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
               if (progress == MagickFalse)
                 break;
             }
@@ -825,7 +825,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                   ScaleQuantumToChar(PixelIntensityToQuantum(p)));
                 p++;
               }
-              progress=SetImageProgress(image,SaveImageTag,y,image->rows);
+              progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
               if (progress == MagickFalse)
                 break;
             }
@@ -906,7 +906,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                       }
                   p++;
                 }
-                progress=SetImageProgress(image,SaveImageTag,y,image->rows);
+                progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
                 if (progress == MagickFalse)
                   break;
               }
@@ -964,7 +964,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                       }
                   p++;
                 }
-                progress=SetImageProgress(image,SaveImageTag,y,image->rows);
+                progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
                 if (progress == MagickFalse)
                   break;
               }
@@ -1025,7 +1025,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                 indexes=GetVirtualIndexQueue(image);
                 for (x=0; x < (ssize_t) image->columns; x++)
                   *q++=(unsigned char) indexes[x];
-                progress=SetImageProgress(image,SaveImageTag,y,image->rows);
+                progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
                 if (progress == MagickFalse)
                   break;
               }
@@ -1057,7 +1057,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                 indexes=GetVirtualIndexQueue(image);
                 for (x=0; x < (ssize_t) image->columns; x++)
                   Ascii85Encode(image,(unsigned char) indexes[x]);
-                progress=SetImageProgress(image,SaveImageTag,y,image->rows);
+                progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
                 if (progress == MagickFalse)
                   break;
               }
index 1ee28def54bcd55afe52626f7b4b5f4795315b5e..73eadc46294905d14334678346c5926bbfdaf4e1 100644 (file)
@@ -286,7 +286,8 @@ static MagickBooleanType SerializeImage(const ImageInfo *image_info,
       }
     if (image->previous == (Image *) NULL)
       {
-        status=SetImageProgress(image,SaveImageTag,y,image->rows);
+        status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
@@ -363,7 +364,8 @@ static MagickBooleanType SerializeImageChannel(const ImageInfo *image_info,
           p++;
         }
       }
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
@@ -413,7 +415,8 @@ static MagickBooleanType SerializeImageIndexes(const ImageInfo *image_info,
       *q++=(unsigned char) indexes[x];
     if (image->previous == (Image *) NULL)
       {
-        status=SetImageProgress(image,SaveImageTag,y,image->rows);
+        status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
index 9fa80348cf85e9196bd7913bdb9d4e6b71d779be..0a6ca716a234ac63475277fa7fa190c064416475 100644 (file)
@@ -241,7 +241,8 @@ static Image *ReadRAWImage(const ImageInfo *image_info,
         }
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,LoadImageTag,y,image->rows);
+          status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
@@ -585,7 +586,8 @@ static MagickBooleanType WriteRAWImage(const ImageInfo *image_info,Image *image)
         break;
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,SaveImageTag,y,image->rows);
+          status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
index 956fd3ae5fa9c3639ca4ca47238e41772dcb15e5..842881c62bf585606b5711fffbed99ae676a47e5 100644 (file)
@@ -309,7 +309,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception)
             }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -381,7 +382,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception)
           }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -922,7 +924,8 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,Image *image)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -953,7 +956,8 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,Image *image)
           }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
index 9a3fdb389082dfa1923afb9fc299ba493f3d7bf4..a1a69dc787357b9070e987a6418814a0ba37c3d0 100644 (file)
@@ -376,7 +376,8 @@ static Image *ReadRLAImage(const ImageInfo *image_info,ExceptionInfo *exception)
         while (runlength > 0);
       }
     }
-    status=SetImageProgress(image,LoadImageTag,y,image->rows);
+    status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 14aabdc52355c3e8ddb563c1bf10f76463dd97ae..4b97a683d70d5137873eea62ff332326b45b3c91 100644 (file)
@@ -452,7 +452,8 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -505,7 +506,8 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 break;
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,LoadImageTag,y,image->rows);
+                  status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
@@ -534,7 +536,8 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 break;
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,LoadImageTag,y,image->rows);
+                  status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
index 4d74831e3b62769d8d200e1fe4662167c199a002..2b7f0f651b7b836c11dfd167f7cb0e23bf3b79c4 100644 (file)
@@ -273,7 +273,8 @@ static Image *ReadSCTImage(const ImageInfo *image_info,ExceptionInfo *exception)
       if ((image->columns % 2) != 0)
         (void) ReadBlobByte(image);  /* pad */
     }
-    status=SetImageProgress(image,LoadImageTag,y,image->rows);
+    status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 2494f1b9fa7c4a834bd77545dd1c5f54f73274ba..2cf4d4b0e422c772558e84647c8bbf13ec1f61e6 100644 (file)
@@ -572,7 +572,8 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 break;
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,LoadImageTag,y,image->rows);
+                  status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
@@ -600,7 +601,8 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
               break;
             if (image->previous == (Image *) NULL)
               {
-                status=SetImageProgress(image,LoadImageTag,y,image->rows);
+                status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
                 if (status == MagickFalse)
                   break;
               }
@@ -637,7 +639,8 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 break;
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,LoadImageTag,y,image->rows);
+                  status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
@@ -661,7 +664,8 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
               break;
             if (image->previous == (Image *) NULL)
               {
-                status=SetImageProgress(image,LoadImageTag,y,image->rows);
+                status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
                 if (status == MagickFalse)
                   break;
               }
@@ -1006,7 +1010,8 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image)
         }
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,SaveImageTag,y,image->rows);
+          status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
index 0cf90f05dc30fe6b911b326723f55eb7a46388fa..297a985f9ab6b91e957ee356f28f30c987ba612e 100644 (file)
@@ -462,7 +462,8 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
           break;
         if (image->previous == (Image *) NULL)
           {
-            status=SetImageProgress(image,LoadImageTag,y,image->rows);
+            status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
             if (status == MagickFalse)
               break;
           }
@@ -489,7 +490,8 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
               break;
             if (image->previous == (Image *) NULL)
               {
-                status=SetImageProgress(image,LoadImageTag,y,image->rows);
+                status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
                 if (status == MagickFalse)
                   break;
               }
@@ -544,7 +546,8 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
               break;
             if (image->previous == (Image *) NULL)
               {
-                status=SetImageProgress(image,LoadImageTag,y,image->rows);
+                status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
                 if (status == MagickFalse)
                   break;
               }
@@ -855,7 +858,8 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image)
           (void) WriteBlob(image,(size_t) (q-pixels),pixels);
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -902,7 +906,8 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image)
               (void) WriteBlobByte(image,0);  /* pad scanline */
             if (image->previous == (Image *) NULL)
               {
-                status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                 if (status == MagickFalse)
                   break;
               }
@@ -940,7 +945,8 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image)
               (void) WriteBlobByte(image,0);  /* pad scanline */
             if (image->previous == (Image *) NULL)
               {
-                status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                 if (status == MagickFalse)
                   break;
               }
index c52602646624c3436a8f91bc1dc87e5b97387298..b3afaef6982a40c95ac76c40e49657eec9eaad1c 100644 (file)
@@ -2880,7 +2880,8 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception)
               break;
             if (image->previous == (Image *) NULL)
               {
-                status=SetImageProgress(image,LoadImageTag,y,image->rows);
+                status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
                 if (status == MagickFalse)
                   break;
               }
index bbacc4ae9033fe663d11879d368407eaabb24761..fa23ceb93b68489d0484800403d809ed6fa15b7c 100644 (file)
@@ -471,7 +471,8 @@ static Image *ReadTGAImage(const ImageInfo *image_info,ExceptionInfo *exception)
         break;
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,LoadImageTag,y,image->rows);
+          status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
@@ -849,7 +850,8 @@ static MagickBooleanType WriteTGAImage(const ImageInfo *image_info,Image *image)
       (void) WriteBlob(image,(size_t) (q-targa_pixels),targa_pixels);
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,SaveImageTag,y,image->rows);
+          status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
index eabf2e2b98a7f53c3c0c675180ec76b978d973d6..0d4c6a73991d29fae3367eb8061870493bf1aa40 100644 (file)
@@ -1233,7 +1233,8 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1289,7 +1290,8 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1344,7 +1346,8 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
           }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1394,7 +1397,8 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1497,7 +1501,8 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1563,7 +1568,8 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -2959,7 +2965,8 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
                 break;
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                  status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
@@ -3082,7 +3089,8 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -3152,7 +3160,8 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
index bed4dc911bbd0a7fe1392525942b4b490ec25a9c..24933878d2df910d331c1aa12a69a64983339bc7 100644 (file)
@@ -279,7 +279,8 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -304,7 +305,8 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -335,7 +337,8 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -364,7 +367,8 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
index 937be743f7ff487b23e9a1f6f2342a9abaf887e8..4b823fd6f8bcb2f9573674b127c3b1e6e81aedbc 100644 (file)
@@ -699,7 +699,8 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image)
         (void) WriteBlobString(image,"\n");
         p++;
       }
-      status=SetImageProgress(image,SaveImageTag,y,image->rows);
+      status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
       if (status == MagickFalse)
         break;
     }
index fabe9863fe175304a54e9510db171754a8ae8008..0025f0d12b6954f399d1413df2d8cffb39ff2169 100644 (file)
@@ -370,7 +370,8 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image)
     (void) FormatMagickString(buffer,MaxTextExtent,"\"%s\n",
       (y == (ssize_t) (image->rows-1) ? ");" : ","));
     (void) WriteBlobString(image,buffer);
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 7876ea9216fbd582b0a065c7aa37885477f5d8a3..0ac925327ea6f35ef439064690747324e2e03fa5 100644 (file)
@@ -177,7 +177,8 @@ static Image *ReadUYVYImage(const ImageInfo *image_info,
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
-    status=SetImageProgress(image,LoadImageTag,y,image->rows);
+    status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
@@ -358,7 +359,8 @@ static MagickBooleanType WriteUYVYImage(const ImageInfo *image_info,
       full=full == MagickFalse ? MagickTrue : MagickFalse;
       p++;
     }
-    status=SetImageProgress(image,LoadImageTag,y,image->rows);
+    status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 1aacb80a9c85929c2194bed38c74aab4d706963d..02803ad88af195f2fea065c2e54f57c33e593aed 100644 (file)
@@ -307,7 +307,8 @@ static Image *ReadVICARImage(const ImageInfo *image_info,
       quantum_type,pixels,exception);
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
-    status=SetImageProgress(image,LoadImageTag,y,image->rows);
+    status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
@@ -484,7 +485,8 @@ static MagickBooleanType WriteVICARImage(const ImageInfo *image_info,
     count=WriteBlob(image,length,pixels);
     if (count != (ssize_t) length)
       break;
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 2f08242913ea1d961a3321bf6494771fab451a5f..dd6e461bdb80643d24d5b200cf81a20fcbeee98f 100644 (file)
@@ -651,7 +651,8 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -671,7 +672,8 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -707,7 +709,8 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
               break;
             if (image->previous == (Image *) NULL)
               {
-                status=SetImageProgress(image,LoadImageTag,y,image->rows);
+                status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
                 if (status == MagickFalse)
                   break;
               }
@@ -1104,7 +1107,8 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
           }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1146,7 +1150,8 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
               *q++=(unsigned char) indexes[x];
             if (image->previous == (Image *) NULL)
               {
-                status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                 if (status == MagickFalse)
                   break;
               }
@@ -1193,7 +1198,8 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
                 *q++=byte >> (8-bit);
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                  status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
@@ -1217,7 +1223,8 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
               }
               if (image->previous == (Image *) NULL)
                 {
-                  status=SetImageProgress(image,SaveImageTag,y,image->rows);
+                  status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
                   if (status == MagickFalse)
                     break;
                 }
index 791801e8535e7943103f055618f2552b433ce377..12366de20118878cbee19e97454f7dc8c454ef5d 100644 (file)
@@ -215,7 +215,8 @@ static Image *ReadWBMPImage(const ImageInfo *image_info,
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
-    status=SetImageProgress(image,LoadImageTag,y,image->rows);
+    status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
@@ -416,7 +417,8 @@ static MagickBooleanType WriteWBMPImage(const ImageInfo *image_info,
     }
     if (bit != 0)
       (void) WriteBlobByte(image,byte);
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index dfb7ca7b7127c961087211337dc8743006dea612..11674957af74dc38430d341620e24ce672b4eac0 100644 (file)
@@ -365,7 +365,8 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception)
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
-    status=SetImageProgress(image,LoadImageTag,y,image->rows);
+    status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
@@ -579,7 +580,8 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image)
         bit=0;
         byte=0;
       };
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 99dad055cec91d456ade22bfe61d5bc505daab5c..d53dc27b76af2c6cc5097b21b473bb762100eb87 100644 (file)
@@ -1029,7 +1029,8 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image)
     (void) WriteBlobString(image,buffer);
     if (image->previous == (Image *) NULL)
       {
-        status=SetImageProgress(image,SaveImageTag,y,image->rows);
+        status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
         if (status == MagickFalse)
           break;
       }
index 30f2f938ccb2afec7b020bae3b524cb22627a7f0..d845a2660bcb9eb2989e06d8f48c76994661fe89 100644 (file)
@@ -204,7 +204,7 @@ static Image *ReadXTRNImage(const ImageInfo *image_info,
       size_t
         blob_length;
 
-                  ssize_t
+                  long
         lBoundl,
         lBoundu;
 
@@ -440,7 +440,7 @@ size_t SafeArrayFifo(const Image *image,const void *data,const size_t length)
   SAFEARRAY *pSafeArray = (SAFEARRAY *)image->client_data;
   if (pSafeArray != NULL)
   {
-                ssize_t lBoundl, lBoundu, lCount;
+                long lBoundl, lBoundu, lCount;
           HRESULT hr = S_OK;
     /* First see how big the buffer currently is */
                 hr = SafeArrayGetLBound(pSafeArray, 1, &lBoundl);
@@ -455,14 +455,14 @@ size_t SafeArrayFifo(const Image *image,const void *data,const size_t length)
     {
             unsigned char       *pReturnBuffer = NULL;
       NewArrayBounds[0].lLbound = 0;   /* Start-Index 0 */
-      NewArrayBounds[0].cElements = (size_t) (length+lCount);  /* # Elemente */
+      NewArrayBounds[0].cElements = (unsigned long) (length+lCount);  /* # Elemente */
       hr = SafeArrayRedim(pSafeArray, NewArrayBounds);
       if (FAILED(hr))
         return 0;
       hr = SafeArrayAccessData(pSafeArray, (void**)&pReturnBuffer);
             if( FAILED(hr) )
                     return 0;
-            (void) CopyMagickMemory( pReturnBuffer+lCount, (unsigned char *)data, length );
+            (void) memcpy( pReturnBuffer+lCount, (unsigned char *)data, length );
       hr = SafeArrayUnaccessData(pSafeArray);
             if( FAILED(hr) )
                     return 0;
index f2133c75b572a4ba22ce7ec7d820c5fde92315b3..690f7ef87879f9dd55a6365da6ee807af6e7dd69 100644 (file)
@@ -418,7 +418,8 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
-            status=SetImageProgress(image,LoadImageTag,y,image->rows);
+            status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
             if (status == MagickFalse)
               break;
           }
@@ -444,7 +445,8 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
             }
             if (SyncAuthenticPixels(image,exception) == MagickFalse)
               break;
-            status=SetImageProgress(image,LoadImageTag,y,image->rows);
+            status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
             if (status == MagickFalse)
               break;
           }
@@ -478,7 +480,8 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)
             break;
-          status=SetImageProgress(image,LoadImageTag,y,image->rows);
+          status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
@@ -778,7 +781,8 @@ static MagickBooleanType WriteXWDImage(const ImageInfo *image_info,Image *image)
     for (x=0; x < (ssize_t) scanline_pad; x++)
       *q++='\0';
     (void) WriteBlob(image,(size_t) (q-pixels),pixels);
-    status=SetImageProgress(image,SaveImageTag,y,image->rows);
+    status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
     if (status == MagickFalse)
       break;
   }
index 2686541ed0db47bfdb5b6f8e7bc6a348548eabd3..6571699b08736b8a54223a40cd45bf9b70459024 100644 (file)
@@ -263,7 +263,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
             }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -339,7 +340,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
           }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,LoadImageTag,y,image->rows);
+              status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1032,7 +1034,8 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info,
             break;
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -1074,7 +1077,8 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info,
             }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
index b058fe61a6e11399d3724d3490a43fcf1a71a17a..598130511940aec20250390dec9e5e806816c381 100644 (file)
@@ -283,7 +283,8 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
           break;
       if (image->previous == (Image *) NULL)
         {
-          status=SetImageProgress(image,LoadImageTag,y,image->rows);
+          status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+                image->rows);
           if (status == MagickFalse)
             break;
         }
@@ -636,7 +637,8 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image)
           }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
@@ -661,7 +663,8 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image)
           }
           if (image->previous == (Image *) NULL)
             {
-              status=SetImageProgress(image,SaveImageTag,y,image->rows);
+              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (status == MagickFalse)
                 break;
             }
index 857c901e6cb5cbef45146b4aadd8929fbc01fa32..8567723bfd5fce190e25c25a2da9ef504b00622c 100644 (file)
@@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License assize_t with GNU Libltdl; see the file COPYING.LIB.  If not, a
+License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
 copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
 or obtained by writing to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
index 45fdde26b1e0a2cde39e19b1d2736fb6f77bb588..05575753d54d8159cabb95f8d97874512eadff8f 100644 (file)
@@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License assize_t with GNU Libltdl; see the file COPYING.LIB.  If not, a
+License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
 copy can be downloaded from http://www.gnu.org/licenses/lgpl.html,
 or obtained by writing to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
index 28e04c7d99ea4089455e878404a98dac37b51532..d39e17e732defb9a5872eb57a1846637fabe00b4 100644 (file)
@@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License assize_t with GNU Libltdl; see the file COPYING.LIB.  If not, a
+License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
 copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
 or obtained by writing to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
index 48469cd0bdfef9e7c238adb53c2efc88128c0cd1..30dc072c136be6ca6fed979f5979f84de9a1e34d 100644 (file)
@@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License assize_t with GNU Libltdl; see the file COPYING.LIB.  If not, a
+License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
 copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
 or obtained by writing to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
index e174463cf6e0c188c2bf3727bfdcf0390af66c9e..377739b5e506c699b0347ae49af5e3bdf3e00e10 100644 (file)
@@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License assize_t with GNU Libltdl; see the file COPYING.LIB.  If not, a
+License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
 copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
 or obtained by writing to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
index 3a522879fb1805fa8e73613f1c54a6cac865885d..4e66a6ca18284ae745ed326020d5278b7791ff63 100644 (file)
@@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License assize_t with GNU Libltdl; see the file COPYING.LIB.  If not, a
+License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
 copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
 or obtained by writing to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
index 7634ba7d9ce6eba843ebe87f655d7235f35cb79b..d7af36dd8bd95294c20ef110a41e27a27fd70e6e 100644 (file)
@@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License assize_t with GNU Libltdl; see the file COPYING.LIB.  If not, a
+License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
 copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
 or obtained by writing to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
index 8c6aae563ca226ddbde79b556cc207df05119b77..9009ad8cdb4dcd494b6b70db7823f33a0f14f053 100644 (file)
@@ -23,7 +23,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License assize_t with GNU Libltdl; see the file COPYING.LIB.  If not, a
+License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
 copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
 or obtained by writing to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -1844,7 +1844,7 @@ foreachfile_callback (char *dirname, void *data1, void *data2)
 }
 
 
-/* Call FUNC for each unique extensionless file in SEARCH_PATH, assize_t
+/* Call FUNC for each unique extensionless file in SEARCH_PATH, along
    with DATA.  The filenames passed to FUNC would be suitable for
    passing to lt_dlopenext.  The extensions are stripped so that
    individual modules do not generate several entries (e.g. libfoo.la,
index 9ea3ffda5216e79dbdb5540a0be59f65bf57af79..8b516ad64c48f74ea6c6bfb33008ff5f62621cec 100644 (file)
@@ -23,7 +23,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License assize_t with GNU Libltdl; see the file COPYING.LIB.  If not, a
+License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
 copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
 or obtained by writing to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
index 1f66008ea31d48d417539fc23b6ce4215214218f..dfc3c8c59ef13e3f08d92c36b1ee4e9572d6c0f8 100644 (file)
@@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License assize_t with GNU Libltdl; see the file COPYING.LIB.  If not, a
+License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
 copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
 or obtained by writing to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -296,7 +296,7 @@ slist_sort_merge (SList *left, SList *right, SListCompare *compare,
 }
 
 /* Perform a destructive quicksort on the items in SLIST, by repeatedly
-   calling COMPARE with a pair of items from SLIST assize_t with USERDATA
+   calling COMPARE with a pair of items from SLIST along with USERDATA
    at every iteration.  COMPARE is a function as defined above for
    slist_sort_merge().  The value of SLIST is undefined after calling
    this function.
@@ -315,7 +315,7 @@ slist_sort (SList *slist, SListCompare *compare, void *userdata)
   right = slist->next;
 
   /* Skip two items with RIGHT and one with SLIST, until RIGHT falls off
-     the end.  SLIST must be about half way assize_t.  */
+     the end.  SLIST must be about half way along.  */
   while (right && (right = right->next))
     {
       if (!right || !(right = right->next))
index c6c96dadfed59333dac563bfc685b152341f2be8..e512534940737eb5a1695b3b25b5a63c8927afbb 100644 (file)
@@ -924,8 +924,8 @@ MagickExport void XAnimateBackgroundImage(Display *display,
   */
   context_values.background=pixel.background_color.pixel;
   context_values.foreground=pixel.foreground_color.pixel;
-  pixel.annotate_context=XCreateGC(display,window_info.id,(size_t)
-    GCBackground | GCForeground,&context_values);
+  pixel.annotate_context=XCreateGC(display,window_info.id,(unsigned long)
+    (GCBackground | GCForeground),&context_values);
   if (pixel.annotate_context == (GC) NULL)
     ThrowXWindowFatalException(XServerFatalError,"UnableToCreateGraphicContext",
       images->filename);
@@ -2350,13 +2350,13 @@ MagickExport Image *XAnimateImages(Display *display,
         */
         if (event.xclient.message_type != windows->wm_protocols)
           break;
-        if (*event.xclient.data.l == (ssize_t) windows->wm_take_focus)
+        if (*event.xclient.data.l == (long) windows->wm_take_focus)
           {
             (void) XSetInputFocus(display,event.xclient.window,RevertToParent,
               (Time) event.xclient.data.l[1]);
             break;
           }
-        if (*event.xclient.data.l != (ssize_t) windows->wm_delete_window)
+        if (*event.xclient.data.l != (long) windows->wm_delete_window)
           break;
         (void) XWithdrawWindow(display,event.xclient.window,
           visual_info->screen);
@@ -2674,7 +2674,7 @@ MagickExport Image *XAnimateImages(Display *display,
           Display image named by the remote command protocol.
         */
         status=XGetWindowProperty(display,event.xproperty.window,
-          event.xproperty.atom,0L,(ssize_t) MaxTextExtent,MagickFalse,(Atom)
+          event.xproperty.atom,0L,(long) MaxTextExtent,MagickFalse,(Atom)
           AnyPropertyType,&type,&format,&length,&after,&data);
         if ((status != Success) || (length == 0))
           break;
index 1f8c2f0c63c9500d9624f4fa00603b3a3adb93f0..244e24b8bb28574fbc0be44f4b547706c3faebdd 100644 (file)
@@ -1665,7 +1665,8 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #pragma omp critical (MagickCore_CompositeImage)
 #endif
-            proceed=SetImageProgress(image,CompositeImageTag,y,image->rows);
+            proceed=SetImageProgress(image,CompositeImageTag,
+              (MagickOffsetType) y,image->rows);
             if (proceed == MagickFalse)
               status=MagickFalse;
           }
@@ -2782,7 +2783,8 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture)
 #if defined(MAGICKCORE_OPENMP_SUPPORT) && defined(MAGICKCORE_FUTURE)
   #pragma omp critical (MagickCore_TextureImage)
 #endif
-            proceed=SetImageProgress(image,TextureImageTag,y,image->rows);
+            proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType)
+              y,image->rows);
             if (proceed == MagickFalse)
               status=MagickFalse;
           }
@@ -2863,7 +2865,8 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture)
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
         #pragma omp critical (MagickCore_TextureImage)
 #endif
-        proceed=SetImageProgress(image,TextureImageTag,y,image->rows);
+        proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType) y,
+          image->rows);
         if (proceed == MagickFalse)
           status=MagickFalse;
       }
index 6929160a51cbf9f94ecc10971f7f730d6be93943..7c0ab29129558411320d9dbb9ce8d85c9d69a27c 100644 (file)
@@ -4655,7 +4655,8 @@ MagickExport MagickBooleanType OpaqueImage(Image *image,
         }
         if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
           break;
-        proceed=SetImageProgress(image,OpaqueImageTag,y,image->rows);
+        proceed=SetImageProgress(image,OpaqueImageTag,(MagickOffsetType) y,
+          image->rows);
         if (proceed == MagickFalse)
           break;
       }
@@ -6794,7 +6795,8 @@ MagickExport MagickBooleanType TransparentImage(Image *image,
     }
     if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
       break;
-    proceed=SetImageProgress(image,TransparentImageTag,y,image->rows);
+    proceed=SetImageProgress(image,TransparentImageTag,(MagickOffsetType) y,
+      image->rows);
     if (proceed == MagickFalse)
       break;
   }
index 65f0d85431bc9e8d737dbe5eb601ef91363d7f97..80db09c55c00f541274fee6f7eb4c433233e6464 100644 (file)
@@ -931,7 +931,7 @@ static const char
     "",
     "  Meta-I    Press to implode image pixels about the center.",
     "",
-    "  Meta-W    Press to alter an image assize_t a sine wave.",
+    "  Meta-W    Press to alter an image along a sine wave.",
     "",
     "  Meta-P    Press to simulate an oil painting.",
     "",
@@ -8548,7 +8548,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
       if (*geometry == '\0')
         break;
       /*
-        Alter an image assize_t a sine wave.
+        Alter an image along a sine wave.
       */
       XSetCursorState(display,windows,MagickTrue);
       XCheckRefreshWindows(display,windows);
index 549e1acb53272f80c361565ba4750fcbb357d8e7..532a9bd8bf1a277e55f87e2fe48501453c298ffa 100644 (file)
@@ -1555,7 +1555,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
         d.x = (coeff[2]-coeff[3])*ca;
         d.y = (coeff[2]-coeff[3])*sa;
         ExpandBounds(d);
-        /* Orthogonal points assize_t top of arc */
+        /* Orthogonal points along top of arc */
         for( a=ceil((coeff[0]-coeff[1]/2.0)/MagickPI2)*MagickPI2;
                a<(coeff[0]+coeff[1]/2.0); a+=MagickPI2 ) {
           ca = cos(a); sa = sin(a);
@@ -1811,7 +1811,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
       {
         fprintf(stderr, "Arc Distort, Internal Coefficients:\n");
         for ( i=0; i<5; i++ )
-          fprintf(stderr, "  c%ld = %+lf\n", i, coeff[i]);
+          fprintf(stderr, "  c%ld = %+lf\n", (long) i, coeff[i]);
         fprintf(stderr, "Arc Distort, FX Equivelent:\n");
         fprintf(stderr, "%s", image_gen);
         fprintf(stderr, "  -fx 'ii=i+page.x; jj=j+page.y;\n");
@@ -1829,7 +1829,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
       {
         fprintf(stderr, "Polar Distort, Internal Coefficents\n");
         for ( i=0; i<8; i++ )
-          fprintf(stderr, "  c%ld = %+lf\n", i, coeff[i]);
+          fprintf(stderr, "  c%ld = %+lf\n", (long) i, coeff[i]);
         fprintf(stderr, "Polar Distort, FX Equivelent:\n");
         fprintf(stderr, "%s", image_gen);
         fprintf(stderr, "  -fx 'ii=i+page.x%+lf; jj=j+page.y%+lf;\n",
@@ -1848,7 +1848,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
       {
         fprintf(stderr, "DePolar Distort, Internal Coefficents\n");
         for ( i=0; i<8; i++ )
-          fprintf(stderr, "  c%ld = %+lf\n", i, coeff[i]);
+          fprintf(stderr, "  c%ld = %+lf\n", (long) i, coeff[i]);
         fprintf(stderr, "DePolar Distort, FX Equivelent:\n");
         fprintf(stderr, "%s", image_gen);
         fprintf(stderr, "  -fx 'aa=(i+.5)*%lf %+lf;\n", coeff[6], -coeff[4] );
@@ -1955,8 +1955,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
       **restrict resample_filter;
 
     ssize_t
-      j,
-      y;
+      j;
 
     status=MagickTrue;
     progress=0;
@@ -2522,15 +2521,17 @@ MagickExport Image *SparseColorImage(const Image *image,
       return((Image *) NULL);
     }
   { /* ----- MAIN CODE ----- */
-    ssize_t
-      j,
-      progress;
+    CacheView
+      *sparse_view;
 
     MagickBooleanType
       status;
 
-    CacheView
-      *sparse_view;
+    MagickOffsetType
+      progress;
+
+    ssize_t
+      j;
 
     status=MagickTrue;
     progress=0;
index af63295839dee941e0e4591feba94e6bcaf21d59..7b897301f49d6691383adfa18ef1207fa140e7a7 100644 (file)
@@ -451,7 +451,7 @@ static void ReversePoints(PointInfo *points,const size_t number_points)
 static PolygonInfo *ConvertPathToPolygon(
   const DrawInfo *magick_unused(draw_info),const PathInfo *path_info)
 {
-  ssize_t
+  long
     direction,
     next_direction;
 
@@ -3630,12 +3630,6 @@ static MagickRealType GetPixelOpacity(PolygonInfo *polygon_info,
   const FillRule fill_rule,const double x,const double y,
   MagickRealType *stroke_opacity)
 {
-  int
-    winding_number;
-
-  ssize_t
-    j;
-
   MagickRealType
     alpha,
     beta,
@@ -3654,6 +3648,10 @@ static MagickRealType GetPixelOpacity(PolygonInfo *polygon_info,
   register ssize_t
     i;
 
+  ssize_t
+    j,
+    winding_number;
+
   /*
     Compute fill & stroke opacity for this (x,y) point.
   */
index 6c66d3d9415451682b189ee6d5ba6e3438fece93..451d2044bac5123fe108e534cf84712385eff679 100644 (file)
@@ -3066,7 +3066,7 @@ MagickExport Image *MedianFilterImage(const Image *image,const double radius,
 %
 %    o sigma: the standard deviation of the Gaussian, in pixels.
 %
-%    o angle: Apply the effect assize_t this angle.
+%    o angle: Apply the effect along this angle.
 %
 %    o exception: return any errors or warnings in this structure.
 %
index a5973395771deb510663ae70422b72931a0e54d3..5c827d5875b8be75fd35f5f7be35af2cc5d04b94 100644 (file)
@@ -654,7 +654,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image,
 %
 %  ClutImage() replaces each color value in the given image, by using it as an
 %  index to lookup a replacement color value in a Color Look UP Table in the
-%  form of an image.  The values are extracted assize_t a diagonal of the CLUT
+%  form of an image.  The values are extracted along a diagonal of the CLUT
 %  image so either a horizontal or vertial gradient image can be used.
 %
 %  Typically this is used to either re-color a gray-scale image according to a
index 91930b3ef5faaca3a8b64de57ffa78e17fada716..a72c786478adce76e110766844c065c27c20a078 100644 (file)
@@ -3724,7 +3724,7 @@ MagickExport MagickBooleanType PlasmaImage(Image *image,
 %
 %    o draw_info: the draw info.
 %
-%    o angle: Apply the effect assize_t this angle.
+%    o angle: Apply the effect along this angle.
 %
 %    o exception: return any errors or warnings in this structure.
 %
@@ -4213,7 +4213,7 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity,
 %
 %    o sigma: the standard deviation of the Gaussian, in pixels.
 %
-%    o angle: Apply the effect assize_t this angle.
+%    o angle: Apply the effect along this angle.
 %
 %    o exception: return any errors or warnings in this structure.
 %
@@ -5238,7 +5238,7 @@ MagickExport Image *VignetteImage(const Image *image,const double radius,
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  WaveImage() creates a "ripple" effect in the image by shifting the pixels
-%  vertically assize_t a sine wave whose amplitude and wavelength is specified
+%  vertically along a sine wave whose amplitude and wavelength is specified
 %  by the given parameters.
 %
 %  The format of the WaveImage method is:
index 5b99457a2c88447321548ff17035a662b6cf9663..bd5837ea27b3dd4ddaa7b13872d20f388191940c 100644 (file)
@@ -1151,7 +1151,7 @@ MagickExport MagickBooleanType InsertValueInSortedLinkedList(
   next->next=list_info->head;
   while (next->next != (ElementInfo *) NULL)
   {
-    i=compare(value,next->next->value);
+    i=(ssize_t) compare(value,next->next->value);
     if ((i < 0) || ((replace != (void **) NULL) && (i == 0)))
       {
         if (i == 0)
index 645f4163912bbbedee50c10ba477f42ea267ab5b..c7797c08337322f8fbda9306a9c34dc9a7bb2b78 100644 (file)
@@ -100,7 +100,9 @@ typedef struct _CubeInfo
     *root;
 
   ssize_t
-    x,
+    x;
+
+  MagickOffsetType
     progress;
 
   size_t
@@ -291,7 +293,8 @@ static CubeInfo *ClassifyImageColors(const Image *image,
         }
       p++;
     }
-    proceed=SetImageProgress(image,EvaluateImageTag,y,image->rows);
+    proceed=SetImageProgress(image,EvaluateImageTag,(MagickOffsetType) y,
+      image->rows);
     if (proceed == MagickFalse)
       break;
   }
@@ -1187,7 +1190,8 @@ MagickExport size_t GetNumberColors(const Image *image,FILE *file,
         MagickBooleanType
           proceed;
 
-        proceed=SetImageProgress(image,HistogramImageTag,i,number_colors);
+        proceed=SetImageProgress(image,HistogramImageTag,(MagickOffsetType) i,
+          number_colors);
         if (proceed == MagickFalse)
           status=MagickFalse;
       }
index c8faa821bfee5a6a6e1452833ef393b866586c80..94a329b1ff811c4c84f53a3f3202b9194e9c0dbe 100644 (file)
@@ -332,7 +332,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
       if ((image->page.width != 0) || (image->page.height != 0) ||
           (image->page.x != 0) || (image->page.y != 0))
         (void) fprintf(file,"%lux%lu%+ld%+ld ",image->page.width,
-          image->page.height,image->page.x,image->page.y);
+          image->page.height,(long) image->page.x,(long) image->page.y);
       (void) fprintf(file,"%lu-bit ",image->depth);
       if (image->type != UndefinedType)
         (void) fprintf(file,"%s ",MagickOptionToMnemonic(MagickTypeOptions,
@@ -353,7 +353,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
           (void) fprintf(file,"PseudoClass %lu=>%luc ",image->total_colors,
             image->colors);
       if (image->error.mean_error_per_pixel != 0.0)
-        (void) fprintf(file,"%ld/%f/%fdb ",(ssize_t)
+        (void) fprintf(file,"%ld/%f/%fdb ",(long)
           (image->error.mean_error_per_pixel+0.5),
           image->error.normalized_mean_error,
           image->error.normalized_maximum_error);
@@ -362,9 +362,9 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
           (void) FormatMagickSize(GetBlobSize(image),MagickFalse,format);
           (void) fprintf(file,"%sB ",format);
         }
-      (void) fprintf(file,"%0.3fu %ld:%02ld.%03ld",user_time,(ssize_t)
-        (elapsed_time/60.0),(ssize_t) floor(fmod(elapsed_time,60.0)),
-        (ssize_t) (1000.0*(elapsed_time-floor(elapsed_time))));
+      (void) fprintf(file,"%0.3fu %ld:%02ld.%03ld",user_time,(long)
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       (void) fprintf(file,"\n");
       (void) fflush(file);
       return(ferror(file) != 0 ? MagickFalse : MagickTrue);
@@ -398,7 +398,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   (void) fprintf(file,"  Class: %s\n",MagickOptionToMnemonic(MagickClassOptions,
     (ssize_t) image->storage_class));
   (void) fprintf(file,"  Geometry: %lux%lu%+ld%+ld\n",image->columns,
-    image->rows,image->tile_offset.x,image->tile_offset.y);
+    image->rows,(long) image->tile_offset.x,(long) image->tile_offset.y);
   if ((image->magick_columns != 0) || (image->magick_rows != 0))
     if ((image->magick_columns != image->columns) ||
         (image->magick_rows != image->rows))
@@ -680,7 +680,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
             (void) QueryMagickColorname(image,&pixel,SVGCompliance,color,
               &image->exception);
             GetColorTuple(&pixel,MagickTrue,hex);
-            (void) fprintf(file,"  %8ld: %s %s %s\n",i,tuple,hex,color);
+            (void) fprintf(file,"  %8ld: %s %s %s\n",(long) i,tuple,hex,color);
             p++;
           }
         }
@@ -720,7 +720,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   if ((image->extract_info.width*image->extract_info.height) != 0)
     (void) fprintf(file,"  Tile geometry: %lux%lu%+ld%+ld\n",
       image->extract_info.width,image->extract_info.height,
-      image->extract_info.x,image->extract_info.y);
+      (long) image->extract_info.x,(long) image->extract_info.y);
   (void) fprintf(file,"  Interlace: %s\n",MagickOptionToMnemonic(
     MagickInterlaceOptions,(ssize_t) image->interlace));
   (void) QueryColorname(image,&image->background_color,SVGCompliance,color,
@@ -740,15 +740,15 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   if ((image->page.width != 0) || (image->page.height != 0) ||
       (image->page.x != 0) || (image->page.y != 0))
     (void) fprintf(file,"  Page geometry: %lux%lu%+ld%+ld\n",image->page.width,
-      image->page.height,image->page.x,image->page.y);
+      image->page.height,(long) image->page.x,(long) image->page.y);
   if ((image->page.x != 0) || (image->page.y != 0))
-    (void) fprintf(file,"  Origin geometry: %+ld%+ld\n",image->page.x,
-      image->page.y);
+    (void) fprintf(file,"  Origin geometry: %+ld%+ld\n",(long) image->page.x,
+      (long) image->page.y);
   (void) fprintf(file,"  Dispose: %s\n",MagickOptionToMnemonic(
     MagickDisposeOptions,(ssize_t) image->dispose));
   if (image->delay != 0)
     (void) fprintf(file,"  Delay: %lux%ld\n",image->delay,
-      image->ticks_per_second);
+      (long) image->ticks_per_second);
   if (image->iterations != 1)
     (void) fprintf(file,"  Iterations: %lu\n",image->iterations);
   if ((image->next != (Image *) NULL) || (image->previous != (Image *) NULL))
@@ -919,7 +919,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
             const char
               *tag;
 
-            ssize_t
+            long
               dataset,
               record,
               sentinel;
@@ -1083,8 +1083,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
     elapsed_time+0.5),MagickFalse,format);
   (void) fprintf(file,"  Pixels per second: %s\n",format);
   (void) fprintf(file,"  User time: %0.3fu\n",user_time);
-  (void) fprintf(file,"  Elapsed time: %ld:%02ld.%03ld\n",(ssize_t)
-    (elapsed_time/60.0),(ssize_t) ceil(fmod(elapsed_time,60.0)),(ssize_t)
+  (void) fprintf(file,"  Elapsed time: %ld:%02ld.%03ld\n",(long)
+    (elapsed_time/60.0),(long) ceil(fmod(elapsed_time,60.0)),(long)
     (1000.0*(elapsed_time-floor(elapsed_time))));
   (void) fprintf(file,"  Version: %s\n",GetMagickVersion((size_t *)
     NULL));
index cfd5783c318481ad4f74ec2f7fd09ea2992c6c97..59f9631c06f274d4948f6cbc8fe294c5bbbf9c61 100644 (file)
@@ -185,8 +185,8 @@ static MagickBooleanType IsBoundsCleared(const Image *image1,
       break;
     for (x=0; x < (ssize_t) bounds->width; x++)
     {
-      if ((p->opacity <= (ssize_t) (QuantumRange/2)) &&
-          (q->opacity > (ssize_t) (QuantumRange/2)))
+      if ((p->opacity <= (Quantum) (QuantumRange/2)) &&
+          (q->opacity > (Quantum) (QuantumRange/2)))
         break;
       p++;
       q++;
@@ -1836,21 +1836,19 @@ MagickExport Image *MergeImageLayers(Image *image,
   MagickBooleanType
     proceed;
 
-  MagickOffsetType
-    scene;
-
   RectangleInfo
     page;
 
-  size_t
-    width,
-    height;
-
   register const Image
     *next;
 
   size_t
-    number_images;
+    number_images,
+    height,
+    width;
+
+  ssize_t
+    scene;
 
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -1963,7 +1961,8 @@ MagickExport Image *MergeImageLayers(Image *image,
   {
     (void) CompositeImage(canvas,image->compose,image,image->page.x-
       canvas->page.x,image->page.y-canvas->page.y);
-    proceed=SetImageProgress(image,MergeLayersTag,scene,number_images);
+    proceed=SetImageProgress(image,MergeLayersTag,(MagickOffsetType) scene,
+      number_images);
     if (proceed == MagickFalse)
       break;
     image=GetNextImageInList(image);
index 7adb8408143211a9bc59c0df8f0bb692c99ac0f1..c49a65744009cf79ec0f45c97c81550bd03821e5 100644 (file)
@@ -209,7 +209,7 @@ MagickExport Image *CloneImages(const Image *images,const char *scenes,
     *clone_images,
     *image;
 
-  ssize_t
+  long
     first,
     last,
     step;
@@ -251,7 +251,7 @@ MagickExport Image *CloneImages(const Image *images,const char *scenes,
       i=0;
       for (next=images; next != (Image *) NULL; next=GetNextImageInList(next))
       {
-        if (i == first)
+        if (i == (ssize_t) first)
           {
             image=CloneImage(next,0,0,MagickTrue,exception);
             if (image == (Image *) NULL)
@@ -343,7 +343,7 @@ MagickExport void DeleteImages(Image **images,const char *scenes,
   Image
     *image;
 
-  ssize_t
+  long
     first,
     last;
 
@@ -398,7 +398,7 @@ MagickExport void DeleteImages(Image **images,const char *scenes,
       }
     if (first > last)
       continue;
-    for (i=first; i <= last; i++)
+    for (i=(ssize_t) first; i <= (ssize_t) last; i++)
       if ((i >= 0) && (i < (ssize_t) length))
         delete_list[i]=MagickTrue;
   }
index b4187977b1e69dc0f2db6263c71b31729b890de7..7dab5094e7875ed4d86b8d85450693e6e0af0f74 100644 (file)
@@ -605,7 +605,7 @@ MagickExport MagickBooleanType ListMagicInfo(FILE *file,
     (void) fprintf(file,"%s",magic_info[i]->name);
     for (j=(ssize_t) strlen(magic_info[i]->name); j <= 9; j++)
       (void) fprintf(file," ");
-    (void) fprintf(file,"%6ld ",(ssize_t) magic_info[i]->offset);
+    (void) fprintf(file,"%6ld ",(long) magic_info[i]->offset);
     if (magic_info[i]->target != (char *) NULL)
       {
         register ssize_t
index c9fb232491ec6634bf46dc504711e34420ce886f..7638698444fc015d2b35a341dbf73bfcdb8db73d 100644 (file)
@@ -168,7 +168,7 @@ MagickExport const MimeInfo *GetMimeInfo(const char *filename,
   EndianType
     endian;
 
-  ssize_t
+  long
     value;
 
   register const MimeInfo
index 5e011b593fe5e6d3af93565c58e26d7d1e964815..fa5108d73aa151fedaa705d7fc098bff451b0aa9 100644 (file)
@@ -1107,11 +1107,14 @@ MagickExport MagickBooleanType ModuleComponentGenesis(void)
   ExceptionInfo
     *exception;
 
+  MagickBooleanType
+    status;
+
   AcquireSemaphoreInfo(&module_semaphore);
   exception=AcquireExceptionInfo();
-  InitializeModuleList(exception);
+  status=InitializeModuleList(exception);
   exception=DestroyExceptionInfo(exception);
-  return(MagickTrue);
+  return(status);
 }
 \f
 /*
index 8f3b6e2cf88f75756d09bf805e2ce2aa9482625f..fa0739e34840839838113b28caac4cc849a10bd9 100644 (file)
@@ -1517,7 +1517,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
 
-        /* set all kernel values assize_t axises to given scale */
+        /* set all kernel values along axises to given scale */
         for ( i=0, v=-kernel->y; v <= (ssize_t)kernel->y; v++)
           for ( u=-kernel->x; u <= (ssize_t)kernel->x; u++, i++)
             kernel->values[i] = (u == 0 || v == 0) ? args->sigma : nan;
@@ -1538,7 +1538,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
 
-        /* set all kernel values assize_t axises to given scale */
+        /* set all kernel values along axises to given scale */
         for ( i=0, v=-kernel->y; v <= (ssize_t)kernel->y; v++)
           for ( u=-kernel->x; u <= (ssize_t)kernel->x; u++, i++)
             kernel->values[i] = (u == v || u == -v) ? args->sigma : nan;
index a687f2fcfe3aa1b1708ffa932dbe32fe6de61465..dc4a1e4d4ab68e37263489ba67de4718f18c5892 100644 (file)
@@ -376,7 +376,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  GradientImage() applies a continuously smooth color transitions assize_t a
+%  GradientImage() applies a continuously smooth color transitions along a
 %  vector from one color to another.
 %
 %  Note, the interface of this method will change in the future to support
index d22ccae7449219bb4a4dcf2197fad15f725edfa8..a83724aa0855c319b8d0516ed045132c1693e565 100644 (file)
@@ -876,7 +876,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
       ResetImageProfileIterator(image);
       for (name=GetNextImageProfile(image); name != (const char *) NULL; )
       {
-        for (i=1; i < number_arguments; i++)
+        for (i=1; i < (ssize_t) number_arguments; i++)
         {
           if ((*arguments[i] == '!') &&
               (LocaleCompare(name,arguments[i]+1) == 0))
@@ -890,7 +890,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
         }
         name=GetNextImageProfile(image);
       }
-      for (i=0; i < number_arguments; i++)
+      for (i=0; i < (ssize_t) number_arguments; i++)
         arguments[i]=DestroyString(arguments[i]);
       arguments=(char **) RelinquishMagickMemory(arguments);
       return(MagickTrue);
@@ -1876,7 +1876,7 @@ MagickExport MagickBooleanType SyncImageProfiles(Image *image)
   }
   if (length < 16)
     return(MagickFalse);
-  id=(int) ReadProfileShort(LSBEndian,exif);
+  id=(ssize_t) ReadProfileShort(LSBEndian,exif);
   endian=LSBEndian;
   if (id == 0x4949)
     endian=LSBEndian;
index 7596b7c54fe884e6a07975475fa79a1242132587..792b043a4a6ed0d3d09c3270d92ea51abeb6cc30 100644 (file)
@@ -395,7 +395,7 @@ static MagickBooleanType GetIPTCProperty(const Image *image,const char *key)
   const StringInfo
     *profile;
 
-  ssize_t
+  long
     count,
     dataset,
     record;
@@ -422,8 +422,8 @@ static MagickBooleanType GetIPTCProperty(const Image *image,const char *key)
       continue;
     length=(size_t) (GetStringInfoDatum(profile)[i+3] << 8);
     length|=GetStringInfoDatum(profile)[i+4];
-    if (((ssize_t) GetStringInfoDatum(profile)[i+1] == dataset) &&
-        ((ssize_t) GetStringInfoDatum(profile)[i+2] == record))
+    if (((long) GetStringInfoDatum(profile)[i+1] == dataset) &&
+        ((long) GetStringInfoDatum(profile)[i+2] == record))
       {
         message=(char *) NULL;
         if (~length >= 1)
@@ -542,11 +542,9 @@ static MagickBooleanType Get8BIMProperty(const Image *image,const char *key)
   const unsigned char
     *info;
 
-  ssize_t
-    id,
+  long
     start,
-    stop,
-    sub_number;
+    stop;
 
   MagickBooleanType
     status;
@@ -555,7 +553,9 @@ static MagickBooleanType Get8BIMProperty(const Image *image,const char *key)
     i;
 
   ssize_t
-    count;
+    count,
+    id,
+    sub_number;
 
   size_t
     length;
@@ -593,9 +593,9 @@ static MagickBooleanType Get8BIMProperty(const Image *image,const char *key)
     if (ReadPropertyByte(&info,&length) != (unsigned char) 'M')
       continue;
     id=(ssize_t) ReadPropertyMSBShort(&info,&length);
-    if (id < start)
+    if (id < (ssize_t) start)
       continue;
-    if (id > stop)
+    if (id > (ssize_t) stop)
       continue;
     if (resource != (char *) NULL)
       resource=DestroyString(resource);
index 3fe59f707c336234dc9df43ab208fba1fa883601..971404f021ed276f2c1000114f751fd71ec9b314 100644 (file)
@@ -595,7 +595,8 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info)
         }
         if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
           break;
-        proceed=SetImageProgress(image,AssignImageTag,y,image->rows);
+        proceed=SetImageProgress(image,AssignImageTag,(MagickOffsetType) y,
+          image->rows);
         if (proceed == MagickFalse)
           break;
       }
@@ -785,7 +786,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
       /*
         Start at the root and descend the color cube tree.
       */
-      for (count=1; (x+count) < image->columns; count++)
+      for (count=1; (x+count) < (ssize_t) image->columns; count++)
         if (IsSameColor(image,p,p+count) == MagickFalse)
           break;
       AssociateAlphaPixel(cube_info,p,&pixel);
@@ -845,7 +846,8 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
         PruneToCubeDepth(image,cube_info,cube_info->root);
         break;
       }
-    proceed=SetImageProgress(image,ClassifyImageTag,y,image->rows);
+    proceed=SetImageProgress(image,ClassifyImageTag,(MagickOffsetType) y,
+      image->rows);
     if (proceed == MagickFalse)
       break;
   }
@@ -873,7 +875,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
       /*
         Start at the root and descend the color cube tree.
       */
-      for (count=1; (x+count) < image->columns; count++)
+      for (count=1; (x+count) < (ssize_t) image->columns; count++)
         if (IsSameColor(image,p,p+count) == MagickFalse)
           break;
       AssociateAlphaPixel(cube_info,p,&pixel);
@@ -928,7 +930,8 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
         node_info->total_color.opacity+=count*QuantumScale*pixel.opacity;
       p+=count;
     }
-    proceed=SetImageProgress(image,ClassifyImageTag,y,image->rows);
+    proceed=SetImageProgress(image,ClassifyImageTag,(MagickOffsetType) y,
+      image->rows);
     if (proceed == MagickFalse)
       break;
   }
@@ -1169,7 +1172,7 @@ static size_t DefineImageColormap(Image *image,CubeInfo *cube_info,
   number_children=cube_info->associate_alpha == MagickFalse ? 8UL : 16UL;
   for (i=0; i < (ssize_t) number_children; i++)
     if (node_info->child[i] != (NodeInfo *) NULL)
-      DefineImageColormap(image,cube_info,node_info->child[i]);
+      (void) DefineImageColormap(image,cube_info,node_info->child[i]);
   if (node_info->number_unique != 0)
     {
       register MagickRealType
@@ -1402,7 +1405,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info)
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
     current=scanlines+(y & 0x01)*image->columns;
     previous=scanlines+((y+1) & 0x01)*image->columns;
-    v=(y & 0x01) ? -1 : 1;
+    v=(ssize_t) ((y & 0x01) ? -1 : 1);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       u=(y & 0x01) ? (ssize_t) image->columns-1-x : x;
@@ -1769,7 +1772,7 @@ static MagickBooleanType DitherImage(Image *image,CubeInfo *cube_info)
   if (cube_info->quantize_info->dither_method == FloydSteinbergDitherMethod)
     return(FloydSteinbergDither(image,cube_info));
   /*
-    Distribute quantization error assize_t a Hilbert curve.
+    Distribute quantization error along a Hilbert curve.
   */
   (void) ResetMagickMemory(cube_info->error,0,ErrorQueueLength*
     sizeof(*cube_info->error));
@@ -1877,7 +1880,7 @@ static CubeInfo *GetCubeInfo(const QuantizeInfo *quantize_info,
   for (i=0; i < (ssize_t) length; i++)
     cube_info->cache[i]=(-1);
   /*
-    Distribute weights assize_t a curve of exponential decay.
+    Distribute weights along a curve of exponential decay.
   */
   weight=1.0;
   for (i=0; i < ErrorQueueLength; i++)
@@ -2486,12 +2489,13 @@ static MagickBooleanType DirectToColormapImage(Image *image,
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      indexes[x]=i;
+      indexes[x]=(IndexPacket) i;
       image->colormap[i++]=(*q++);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       break;
-    proceed=SetImageProgress(image,AssignImageTag,y,image->rows);
+    proceed=SetImageProgress(image,AssignImageTag,(MagickOffsetType) y,
+      image->rows);
     if (proceed == MagickFalse)
       status=MagickFalse;
   }
@@ -2675,7 +2679,8 @@ MagickExport MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info,
     if (status == MagickFalse)
       break;
     (void) SetImageProgressMonitor(image,progress_monitor,image->client_data);
-    proceed=SetImageProgress(image,AssignImageTag,i,number_images);
+    proceed=SetImageProgress(image,AssignImageTag,(MagickOffsetType) i,
+      number_images);
     if (proceed == MagickFalse)
       break;
     image=GetNextImageInList(image);
@@ -2696,7 +2701,8 @@ MagickExport MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info,
           break;
         (void) SetImageProgressMonitor(image,progress_monitor,
           image->client_data);
-        proceed=SetImageProgress(image,AssignImageTag,i,number_images);
+        proceed=SetImageProgress(image,AssignImageTag,(MagickOffsetType) i,
+          number_images);
         if (proceed == MagickFalse)
           break;
         image=GetNextImageInList(image);
@@ -3029,7 +3035,7 @@ static int IntensityCompare(const void *x,const void *y)
   color_2=(PixelPacket *) y;
   intensity=PixelIntensityToQuantum(color_1)-(ssize_t)
     PixelIntensityToQuantum(color_2);
-  return(intensity);
+  return((int) intensity);
 }
 
 #if defined(__cplusplus) || defined(c_plusplus)
index 0278ec7c8c0866a80d9182a3d30a94686f6311da..6d2fb6c79bacbc6725a22357403eb7d32b4ae363 100644 (file)
@@ -2003,7 +2003,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             q=PopCharPixel(pixel,q);
             pixel=ScaleQuantumToChar(GetBluePixelComponent(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar(GetAlphaPixelComponent(p));
+            pixel=ScaleQuantumToChar((Quantum) GetAlphaPixelComponent(p));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2039,25 +2039,25 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                     case 0: quantum=p->red; break;
                     case 1: quantum=p->green; break;
                     case 2: quantum=p->blue; break;
-                    case 3: quantum=QuantumRange-p->opacity; break;
+                    case 3: quantum=(Quantum) (QuantumRange-p->opacity); break;
                   }
                   switch (n % 3)
                   {
                     case 0:
                     {
-                      pixel|=(size_t) (ScaleQuantumToAny(quantum,
+                      pixel|=(size_t) (ScaleQuantumToAny((Quantum) quantum,
                         range) << 22);
                       break;
                     }
                     case 1:
                     {
-                      pixel|=(size_t) (ScaleQuantumToAny(quantum,
+                      pixel|=(size_t) (ScaleQuantumToAny((Quantum) quantum,
                         range) << 12);
                       break;
                     }
                     case 2:
                     {
-                      pixel|=(size_t) (ScaleQuantumToAny(quantum,
+                      pixel|=(size_t) (ScaleQuantumToAny((Quantum) quantum,
                         range) << 2);
                       q=PopLongPixel(endian,pixel,q);
                       pixel=0;
@@ -2081,8 +2081,8 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                 q=PopQuantumLongPixel(&quantum_state,image->depth,pixel,q);
                 pixel=(size_t) ScaleQuantumToAny(p->blue,range);
                 q=PopQuantumLongPixel(&quantum_state,image->depth,pixel,q);
-                pixel=(size_t) ScaleQuantumToAny(QuantumRange-p->opacity,
-                  range);
+                pixel=(size_t) ScaleQuantumToAny((Quantum) (QuantumRange-
+                  p->opacity),range);
                 q=PopQuantumLongPixel(&quantum_state,image->depth,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -2097,8 +2097,8 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             q=PopQuantumPixel(&quantum_state,image->depth,pixel,q);
             pixel=(size_t) ScaleQuantumToAny(p->blue,range);
             q=PopQuantumPixel(&quantum_state,image->depth,pixel,q);
-            pixel=(size_t) ScaleQuantumToAny(QuantumRange-
-              p->opacity,range);
+            pixel=(size_t) ScaleQuantumToAny((Quantum) (QuantumRange-
+              p->opacity),range);
             q=PopQuantumPixel(&quantum_state,image->depth,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2139,7 +2139,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             q=PopShortPixel(endian,pixel,q);
             pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort(GetAlphaPixelComponent(p));
+            pixel=ScaleQuantumToShort((Quantum) GetAlphaPixelComponent(p));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2161,7 +2161,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                 q=PopFloatPixel(&quantum_state,(float) p->red,q);
                 q=PopFloatPixel(&quantum_state,(float) p->green,q);
                 q=PopFloatPixel(&quantum_state,(float) p->blue,q);
-                pixel=GetAlphaPixelComponent(p);
+                pixel=(float) GetAlphaPixelComponent(p);
                 q=PopFloatPixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -2176,7 +2176,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             q=PopLongPixel(endian,pixel,q);
             pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong(GetAlphaPixelComponent(p));
+            pixel=ScaleQuantumToLong((Quantum) GetAlphaPixelComponent(p));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2215,7 +2215,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             q=PopQuantumPixel(&quantum_state,image->depth,ScaleQuantumToAny(
               GetBluePixelComponent(p),range),q);
             q=PopQuantumPixel(&quantum_state,image->depth,ScaleQuantumToAny(
-              GetAlphaPixelComponent(p),range),q);
+              (Quantum) GetAlphaPixelComponent(p),range),q);
             p++;
             q+=quantum_info->pad;
           }
index 5bb6e95014d167ad05b83657fcf548d189eb34de..7def54e77ee6d66ca649ae9b44b5eaa741a4f9c5 100644 (file)
@@ -442,7 +442,7 @@ MagickExport int AcquireUniqueFileResource(char *path)
   if (random_info == (RandomInfo *) NULL)
     random_info=AcquireRandomInfo();
   file=(-1);
-  for (i=0; i < TMP_MAX; i++)
+  for (i=0; i < (ssize_t) TMP_MAX; i++)
   {
     /*
       Get temporary pathname.
@@ -913,7 +913,7 @@ MagickExport MagickBooleanType ResourceComponentGenesis(void)
   pagesize=GetMagickPageSize();
   pages=(-1);
 #if defined(MAGICKCORE_HAVE_SYSCONF) && defined(_SC_PHYS_PAGES)
-  pages=sysconf(_SC_PHYS_PAGES);
+  pages=(ssize_t) sysconf(_SC_PHYS_PAGES);
 #endif
   memory=(MagickSizeType) pages*pagesize;
   if ((pagesize <= 0) || (pages <= 0))
@@ -959,7 +959,7 @@ MagickExport MagickBooleanType ResourceComponentGenesis(void)
     }
   files=(-1);
 #if defined(MAGICKCORE_HAVE_SYSCONF) && defined(_SC_OPEN_MAX)
-  files=sysconf(_SC_OPEN_MAX);
+  files=(ssize_t) sysconf(_SC_OPEN_MAX);
 #endif
 #if defined(MAGICKCORE_HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE)
   if (files < 0)
index c1f5e3ed61f683eb16fc750ef7b7e1cf3ac2f269..428b823fe7fdd8ca67ff0e5e93d93dc34a721f00 100644 (file)
@@ -459,8 +459,8 @@ static MagickBooleanType Classify(Image *image,short **extrema,
       (void) fprintf(stdout,"\n\nNumber of Vectors Per Cluster\n");
       (void) fprintf(stdout,"=============================\n\n");
       for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
-        (void) fprintf(stdout,"Cluster #%ld = %ld\n",cluster->id,
-          cluster->count);
+        (void) fprintf(stdout,"Cluster #%ld = %ld\n",(long) cluster->id,
+          (long) cluster->count);
       /*
         Print the cluster extents.
       */
@@ -469,10 +469,11 @@ static MagickBooleanType Classify(Image *image,short **extrema,
       (void) fprintf(stdout,"================");
       for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
       {
-        (void) fprintf(stdout,"\n\nCluster #%ld\n\n",cluster->id);
-        (void) fprintf(stdout,"%ld-%ld  %ld-%ld  %ld-%ld\n",cluster->red.left,
-          cluster->red.right,cluster->green.left,cluster->green.right,
-          cluster->blue.left,cluster->blue.right);
+        (void) fprintf(stdout,"\n\nCluster #%ld\n\n",(long) cluster->id);
+        (void) fprintf(stdout,"%ld-%ld  %ld-%ld  %ld-%ld\n",(long)
+          cluster->red.left,(long) cluster->red.right,(long)
+          cluster->green.left,(long) cluster->green.right,(long)
+          cluster->blue.left,(long) cluster->blue.right);
       }
       /*
         Print the cluster center values.
@@ -482,7 +483,7 @@ static MagickBooleanType Classify(Image *image,short **extrema,
       (void) fprintf(stdout,"=====================");
       for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
       {
-        (void) fprintf(stdout,"\n\nCluster #%ld\n\n",cluster->id);
+        (void) fprintf(stdout,"\n\nCluster #%ld\n\n",(long) cluster->id);
         (void) fprintf(stdout,"%g  %g  %g\n",(double)
           cluster->red.center,(double) cluster->green.center,(double)
           cluster->blue.center);
@@ -793,7 +794,7 @@ static void ConsolidateCrossings(ZeroCrossing *zero_crossing,
           if (((count % 2) == 0) && (right != k))
             correct=right;
         }
-      l=zero_crossing[i].crossings[j];
+      l=(ssize_t) zero_crossing[i].crossings[j];
       zero_crossing[i].crossings[j]=0;
       if (correct != -1)
         zero_crossing[i].crossings[correct]=(short) l;
@@ -1122,7 +1123,8 @@ MagickExport MagickBooleanType GetImageDynamicThreshold(const Image *image,
           }
       p++;
     }
-    proceed=SetImageProgress(image,SegmentImageTag,y,2*image->rows);
+    proceed=SetImageProgress(image,SegmentImageTag,(MagickOffsetType) y,
+      2*image->rows);
     if (proceed == MagickFalse)
       break;
   }
index 065f47706446803ed7358ab0d6d7bd6fd1d083de..d8867cf7ee655c703e45ac1549b25f1fa67ef7d8 100644 (file)
@@ -1414,7 +1414,7 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations,
 %
 %    o image: the image.
 %
-%    o degrees: A MagickRealType representing the shearing angle assize_t the X
+%    o degrees: A MagickRealType representing the shearing angle along the X
 %      axis.
 %
 %    o width, height, x_offset, y_offset: Defines a region of the image
@@ -1634,7 +1634,7 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
 %
 %    o image: the image.
 %
-%    o degrees: A MagickRealType representing the shearing angle assize_t the Y
+%    o degrees: A MagickRealType representing the shearing angle along the Y
 %      axis.
 %
 %    o width, height, x_offset, y_offset: Defines a region of the image
@@ -1939,8 +1939,10 @@ MagickExport Image *RotateImage(const Image *image,const double degrees,
       height=image->columns;
     }
   y_width=width+(ssize_t) floor(fabs(shear.x)*height+0.5);
-  x_offset=(ssize_t) ceil(width+((fabs(shear.y)*height)-width)/2.0-0.5);
-  y_offset=(ssize_t) ceil(height+((fabs(shear.y)*y_width)-height)/2.0-0.5);
+  x_offset=(ssize_t) ceil((double) width+((fabs(shear.y)*height)-width)/2.0-
+    0.5);
+  y_offset=(ssize_t) ceil((double) height+((fabs(shear.y)*y_width)-height)/2.0-
+    0.5);
   /*
     Surround image with a border.
   */
@@ -2001,9 +2003,9 @@ MagickExport Image *RotateImage(const Image *image,const double degrees,
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  ShearImage() creates a new image that is a shear_image copy of an existing
-%  one.  Shearing slides one edge of an image assize_t the X or Y axis, creating
-%  a parallelogram.  An X direction shear slides an edge assize_t the X axis,
-%  while a Y direction shear slides an edge assize_t the Y axis.  The amount of
+%  one.  Shearing slides one edge of an image along the X or Y axis, creating
+%  a parallelogram.  An X direction shear slides an edge along the X axis,
+%  while a Y direction shear slides an edge along the Y axis.  The amount of
 %  the shear is controlled by a shear angle.  For X direction shears, x_shear
 %  is measured relative to the Y axis, and similarly, for Y direction shears
 %  y_shear is measured relative to the X axis.  Empty triangles left over from
@@ -2083,10 +2085,10 @@ MagickExport Image *ShearImage(const Image *image,const double x_shear,
     Compute image size.
   */
   y_width=image->columns+(ssize_t) floor(fabs(shear.x)*image->rows+0.5);
-  x_offset=(ssize_t) ceil(image->columns+((fabs(shear.x)*image->rows)-
+  x_offset=(ssize_t) ceil((double) image->columns+((fabs(shear.x)*image->rows)-
     image->columns)/2.0-0.5);
-  y_offset=(ssize_t) ceil(image->rows+((fabs(shear.y)*y_width)-image->rows)/2.0-
-    0.5);
+  y_offset=(ssize_t) ceil((double) image->rows+((fabs(shear.y)*y_width)-
+    image->rows)/2.0-0.5);
   /*
     Surround image with border.
   */
index acfb3b2d0734938347c54f85caf185587c392676..8c4b8ec0677f42000654f660027bc2d12ba978fc 100644 (file)
@@ -1014,10 +1014,10 @@ MagickExport ThresholdMap *GetThresholdMapFile(const char *xml,
   if ( map->levels == (ssize_t *)NULL )
     ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireThresholdMap");
   { /* parse levels into integer array */
-    int i;
+    ssize_t i;
     char *p;
     for( i=0; i< (ssize_t) (map->width*map->height); i++) {
-      map->levels[i] = (int)strtol(content, &p, 10);
+      map->levels[i] = (ssize_t)strtol(content, &p, 10);
       if ( p == content ) {
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
           "XmlInvalidContent", "<level> too few values, map \"%s\"", map_id);
@@ -1466,7 +1466,7 @@ printf("DEBUG levels  r=%ld g=%ld b=%ld a=%ld i=%ld\n",
 #endif
 
   { /* Do the posterized ordered dithering of the image */
-    int
+    ssize_t
       d;
 
     /* d = number of psuedo-level divisions added between color levels */
@@ -1512,7 +1512,7 @@ printf("DEBUG levels  r=%ld g=%ld b=%ld a=%ld i=%ld\n",
       indexes=GetCacheViewAuthenticIndexQueue(image_view);
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        register int
+        register ssize_t
           threshold,
           t,
           l;
@@ -1535,28 +1535,28 @@ printf("DEBUG levels  r=%ld g=%ld b=%ld a=%ld i=%ld\n",
               Opacity is inverted so 'off' represents transparent.
         */
         if (levels.red) {
-          t = (int) (QuantumScale*q->red*(levels.red*d+1));
+          t = (ssize_t) (QuantumScale*q->red*(levels.red*d+1));
           l = t/d;  t = t-l*d;
           q->red=(Quantum) ((l+(t >= threshold))*QuantumRange/levels.red);
         }
         if (levels.green) {
-          t = (int) (QuantumScale*q->green*(levels.green*d+1));
+          t = (ssize_t) (QuantumScale*q->green*(levels.green*d+1));
           l = t/d;  t = t-l*d;
           q->green=(Quantum) ((l+(t >= threshold))*QuantumRange/levels.green);
         }
         if (levels.blue) {
-          t = (int) (QuantumScale*q->blue*(levels.blue*d+1));
+          t = (ssize_t) (QuantumScale*q->blue*(levels.blue*d+1));
           l = t/d;  t = t-l*d;
           q->blue=(Quantum) ((l+(t >= threshold))*QuantumRange/levels.blue);
         }
         if (levels.opacity) {
-          t = (int) ((1.0-QuantumScale*q->opacity)*(levels.opacity*d+1));
+          t = (ssize_t) ((1.0-QuantumScale*q->opacity)*(levels.opacity*d+1));
           l = t/d;  t = t-l*d;
           q->opacity=(Quantum) ((1.0-l-(t >= threshold))*QuantumRange/
             levels.opacity);
         }
         if (levels.index) {
-          t = (int) (QuantumScale*indexes[x]*(levels.index*d+1));
+          t = (ssize_t) (QuantumScale*indexes[x]*(levels.index*d+1));
           l = t/d;  t = t-l*d;
           indexes[x]=(IndexPacket) ((l+(t>=threshold))*QuantumRange/
             levels.index);
index d51109b8b29078b06c7db9ae6cff7413c537e635..79774a3a3c310826210dc2763b48fdb025f38c0f 100644 (file)
@@ -775,7 +775,7 @@ static ssize_t sindex(int c,const char *string)
 
   for (p=string; *p != '\0'; p++)
     if (c == (int) (*p))
-      return(p-string);
+      return((ssize_t) (p-string));
   return(-1);
 }
 
index 9c036e84cce684dfbc777e1272f3a68763f9444f..dfed149c5da5476a4f107ff8b5f20a52c41006e3 100644 (file)
@@ -1932,7 +1932,7 @@ MagickExport int SystemCommand(const MagickBooleanType asynchronous,
       errno=EPERM;
       (void) ThrowMagickException(exception,GetMagickModule(),PolicyError,
         "NotAuthorized","`%s'",arguments[1]);
-      for (i=0; i < number_arguments; i++)
+      for (i=0; i < (ssize_t) number_arguments; i++)
         arguments[i]=DestroyString(arguments[i]);
       arguments=(char **) RelinquishMagickMemory(arguments);
       return(-1);
@@ -2016,7 +2016,7 @@ MagickExport int SystemCommand(const MagickBooleanType asynchronous,
       "`%s' (%d)",command,status);
   if (shell_command != command)
     shell_command=DestroyString(shell_command);
-  for (i=0; i < number_arguments; i++)
+  for (i=0; i < (ssize_t) number_arguments; i++)
     arguments[i]=DestroyString(arguments[i]);
   arguments=(char **) RelinquishMagickMemory(arguments);
   return(status);
index 0656fba1d740414d504f1128ebb1cfad4d0d69e4..1eca769066b26d50914c9cdaadf7c8d69e6b8aed 100644 (file)
@@ -1966,7 +1966,7 @@ MagickExport XMLTreeInfo *NewXMLTree(const char *xml,ExceptionInfo *exception)
                 for (l=0; (*p != '\0') && (((l == 0) && (*p != '>')) ||
                      ((l != 0) && ((*p != ']') ||
                      (*(p+strspn(p+1,XMLWhitespace)+1) != '>'))));
-                  l=(*p == '[') ? 1 : l)
+                  l=(ssize_t) (*p == '[') ? 1 : l)
                 p+=strcspn(p+1,"[]>")+1;
                 if ((*p == '\0') && (terminal != '>'))
                   {
@@ -2119,7 +2119,7 @@ MagickExport XMLTreeInfo *NewXMLTreeTag(const char *tag)
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  PruneTagFromXMLTree() prunes a tag from the xml-tree assize_t with all its
+%  PruneTagFromXMLTree() prunes a tag from the xml-tree along with all its
 %  subtags.
 %
 %  The format of the PruneTagFromXMLTree method is:
index bd09fbf11096a6f295b070fd408a2b69da9b6310..07a074ec4e00cff1919e322fc4521f240fa93761 100644 (file)
@@ -441,7 +441,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
         */
         FireImageStack(MagickFalse,MagickFalse,pend);
         filename=option;
-        if ((LocaleCompare(filename,"--") == 0) && (i < (argc-1)))
+        if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1)))
           {
             option=argv[++i];
             filename=option;
index 2e0094d07ad87ef7849b8f6069a69c04fa1a8c1b..40be5eda9cf1046cff99b69cb76d447bf7d6b11a 100644 (file)
@@ -320,7 +320,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
         */
         FireImageStack(MagickFalse,MagickFalse,pend);
         filename=argv[i];
-        if ((LocaleCompare(filename,"--") == 0) && (i < (argc-1)))
+        if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1)))
           filename=argv[++i];
         (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
         images=ReadImages(image_info,exception);
@@ -984,8 +984,8 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
                 (double) distortion);
               if ((reconstruct_image->columns != image->columns) ||
                   (reconstruct_image->rows != image->rows))
-                (void) fprintf(stderr," @ %ld,%ld",difference_image->page.x,
-                  difference_image->page.y);
+                (void) fprintf(stderr," @ %ld,%ld",(long)
+                  difference_image->page.x,(long) difference_image->page.y);
               (void) fprintf(stderr,"\n");
               break;
             }
@@ -995,8 +995,8 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
               (void) fprintf(stderr,"%g",distortion);
               if ((reconstruct_image->columns != image->columns) ||
                   (reconstruct_image->rows != image->rows))
-                (void) fprintf(stderr," @ %ld,%ld",difference_image->page.x,
-                  difference_image->page.y);
+                (void) fprintf(stderr," @ %ld,%ld",(long)
+                  difference_image->page.x,(long) difference_image->page.y);
               (void) fprintf(stderr,"\n");
               break;
             }
@@ -1007,8 +1007,8 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
                 image->error.normalized_maximum_error);
               if ((reconstruct_image->columns != image->columns) ||
                   (reconstruct_image->rows != image->rows))
-                (void) fprintf(stderr," @ %ld,%ld",difference_image->page.x,
-                  difference_image->page.y);
+                (void) fprintf(stderr," @ %ld,%ld",(long)
+                  difference_image->page.x,(long) difference_image->page.y);
               (void) fprintf(stderr,"\n");
               break;
             }
@@ -1026,8 +1026,8 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
           (void) fprintf(stderr,"Image: %s\n",image->filename);
           if ((reconstruct_image->columns != image->columns) ||
               (reconstruct_image->rows != image->rows))
-            (void) fprintf(stderr,"Offset: %ld,%ld\n",difference_image->page.x,
-              difference_image->page.y);
+            (void) fprintf(stderr,"Offset: %ld,%ld\n",(long)
+              difference_image->page.x,(long) difference_image->page.y);
           (void) fprintf(stderr,"  Channel distortion: %s\n",
             MagickOptionToMnemonic(MagickMetricOptions,(ssize_t) metric));
           switch (metric)
index 2993126c596f3f3fcb8581594f85a649a4d584fe..557c10ef3a3a9a1c71152d5f134eb83af5ccaa46 100644 (file)
@@ -510,7 +510,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
         */
         FireImageStack(MagickFalse,MagickFalse,pend);
         filename=argv[i];
-        if ((LocaleCompare(filename,"--") == 0) && (i < (argc-1)))
+        if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1)))
           filename=argv[++i];
         (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
         images=ReadImages(image_info,exception);
index df1c29a564549dbb0095e884cba9a6d69bb6aba1..40dccbb565545f5f07989ca86cb07a617150a3ce 100644 (file)
@@ -301,7 +301,7 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info,
     status=image != (Image *) NULL ? MagickTrue : MagickFalse;
     number_images++;
   }
-  if (i != argc)
+  if (i != (ssize_t) argc)
     ThrowConjureException(OptionError,"MissingAnImageFilename",argv[i]);
   if (number_images == 0)
     ThrowConjureException(OptionError,"MissingAnImageFilename",argv[argc-1]);
index 5b7101c5de1ced70f5640f231273a8f327c011a0..490be689fe7dcf9f3a3f66754b677a4a96f5ed22 100644 (file)
@@ -167,9 +167,9 @@ static MagickBooleanType ConvertUsage(void)
       "-charcoal radius     simulate a charcoal drawing",
       "-chop geometry       remove pixels from the image interior",
       "-clamp               restrict pixel range from 0 to the quantum depth",
-      "-clip                clip assize_t the first path from the 8BIM profile",
+      "-clip                clip along the first path from the 8BIM profile",
       "-clip-mask filename  associate a clip mask with the image",
-      "-clip-path id        clip assize_t a named path from the 8BIM profile",
+      "-clip-path id        clip along a named path from the 8BIM profile",
       "-colorize value      colorize the image with the fill color",
       "-color-matrix matrix apply color correction to the image",
       "-contrast            enhance or reduce the image contrast",
@@ -259,7 +259,7 @@ static MagickBooleanType ConvertUsage(void)
       "-shadow geometry     simulate an image shadow",
       "-sharpen geometry    sharpen the image",
       "-shave geometry      shave pixels from the image edges",
-      "-shear geometry      slide one edge of the image assize_t the X or Y axis",
+      "-shear geometry      slide one edge of the image along the X or Y axis",
       "-sigmoidal-contrast geometry",
       "                     increase the contrast without saturating highlights or shadows",
       "-sketch geometry     simulate a pencil sketch",
@@ -283,7 +283,7 @@ static MagickBooleanType ConvertUsage(void)
       "-unique-colors       discard all but one of any pixel color",
       "-unsharp geometry    sharpen the image",
       "-vignette geometry   soften the edges of the image in vignette style",
-      "-wave geometry       alter an image assize_t a sine wave",
+      "-wave geometry       alter an image along a sine wave",
       "-white-threshold value",
       "                     force all pixels above the threshold into white",
       (char *) NULL
@@ -572,7 +572,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
         */
         FireImageStack(MagickTrue,MagickTrue,pend);
         filename=argv[i];
-        if ((LocaleCompare(filename,"--") == 0) && (i < (argc-1)))
+        if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1)))
           filename=argv[++i];
         (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
         if (image_info->ping != MagickFalse)
index 269ad5b0cc69f248949d4352110d868f59538351..8261d7607c1a641a3f60ac2ea1366a2a4b779045 100644 (file)
@@ -139,7 +139,7 @@ WandExport MagickWand *MagickAverageImages(MagickWand *wand)
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  MagickClipPathImage() clips assize_t the named paths from the 8BIM profile, if
+%  MagickClipPathImage() clips along the named paths from the 8BIM profile, if
 %  present. Later operations take effect inside the path.  Id may be a number
 %  if preceded with #, to work on a numbered path, e.g., "#1" to use the first
 %  path.
index cf87de1d9e941051131e25af774a8f2697aca165..b7ff07540859cf0f8f757e79de42aa75d20ebd79 100644 (file)
@@ -117,8 +117,8 @@ static MagickBooleanType DisplayUsage(void)
     {
       "-auto-orient         automagically orient image",
       "-border geometry     surround image with a border of color",
-      "-clip                clip assize_t the first path from the 8BIM profile",
-      "-clip-path id        clip assize_t a named path from the 8BIM profile",
+      "-clip                clip along the first path from the 8BIM profile",
+      "-clip-path id        clip along a named path from the 8BIM profile",
       "-colors value        preferred number of colors in the image",
       "-contrast            enhance or reduce the image contrast",
       "-crop geometry       preferred size and location of the cropped image",
@@ -390,7 +390,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
   if (image_marker == (size_t *) NULL)
     ThrowDisplayException(ResourceLimitError,"MemoryAllocationFailed",
       GetExceptionMessage(errno));
-  for (i=0; i <= argc; i++)
+  for (i=0; i <= (ssize_t) argc; i++)
     image_marker[i]=(size_t) argc;
   /*
     Check for server name specified on the command line.
@@ -504,7 +504,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
         */
         FireImageStack(MagickFalse,MagickFalse,pend);
         filename=option;
-        if ((LocaleCompare(filename,"--") == 0) && (i < (argc-1)))
+        if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1)))
           {
             option=argv[++i];
             filename=option;
@@ -519,7 +519,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
         AppendImageStack(images);
         FinalizeImageSettings(image_info,image,MagickFalse);
         iterations=0;
-        if (i == (argc-1))
+        if (i == (ssize_t) (argc-1))
           iterations=image->iterations;
         do
         {
@@ -599,14 +599,14 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             Proceed to next/previous image.
           */
           if ((state & FormerImageState) != 0)
-            for (l=0; l < resource_info.quantum; l++)
+            for (l=0; l < (ssize_t) resource_info.quantum; l++)
             {
               image=GetPreviousImageInList(image);
               if (image == (Image *) NULL)
                 break;
             }
           else
-            for (l=0; l < resource_info.quantum; l++)
+            for (l=0; l < (ssize_t) resource_info.quantum; l++)
             {
               image=GetNextImageInList(image);
               if (image == (Image *) NULL)
@@ -645,7 +645,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             if ((state & FormerImageState) != 0)
               {
 
-                for (i=1; i < (argc-2); i++)
+                for (i=1; i < (ssize_t) (argc-2); i++)
                   if (last_image == image_marker[i])
                     break;
                 image_number=(ssize_t) image_marker[i]+1;
index e1eeb20df9d60afb863bf2a646c63b2319a724da..eb133b85ef8b2010dc0f8ad3a4b55883632e1182 100644 (file)
@@ -4770,7 +4770,7 @@ WandExport void DrawSetOpacity(DrawingWand *wand,const double opacity)
   if ((wand->filter_off != MagickFalse) ||
       (CurrentContext->opacity != quantum_opacity))
     {
-      CurrentContext->opacity=opacity;
+      CurrentContext->opacity=(Quantum) opacity;
       (void) MvgPrintf(wand,"opacity %g\n",opacity);
     }
 }
@@ -6070,7 +6070,7 @@ static inline MagickBooleanType IsPoint(const char *point)
   char
     *p;
 
-  ssize_t
+  long
     value;
 
   value=strtol(point,&p,10);
index df4927bffa0724d63f7fddc2165b86dae3daab08..1e141723a47706a194d67b9be8410d5231d6fb81 100644 (file)
@@ -306,7 +306,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
         identify_info=CloneImageInfo(image_info);
         identify_info->verbose=MagickFalse;
         filename=argv[i];
-        if ((LocaleCompare(filename,"--") == 0) && (i < (argc-1)))
+        if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1)))
           filename=argv[++i];
         (void) CopyMagickString(identify_info->filename,filename,MaxTextExtent);
         if (identify_info->ping != MagickFalse)
@@ -828,7 +828,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
   }
   if (k != 0)
     ThrowIdentifyException(OptionError,"UnbalancedParenthesis",argv[i]);
-  if (i != argc)
+  if (i != (ssize_t) argc)
     ThrowIdentifyException(OptionError,"MissingAnImageFilename",argv[i]);
   DestroyIdentify();
   return(status != 0 ? MagickTrue : MagickFalse);
index 669131e7e7a83c7d85c8b9907953606c3c05cede..b897a357bf6bb1835eff98acf247dba148d5ec8f 100644 (file)
@@ -1283,7 +1283,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
   }
   if (k != 0)
     ThrowImportException(OptionError,"UnbalancedParenthesis",argv[i]);
-  if (i-- != argc)
+  if (i-- != (ssize_t) argc)
     ThrowImportException(OptionError,"MissingAnImageFilename",argv[i]);
   if (image == (Image *) NULL)
     ThrowImportException(OptionError,"MissingAnImageFilename",argv[argc-1]);
index 7c2a29231c34023efda38183462ba47b6638099d..99557a3b360c6b08df8029018b78865056e8d3ac 100644 (file)
@@ -1308,7 +1308,7 @@ WandExport MagickBooleanType MagickClampImageChannel(MagickWand *wand,
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  MagickClipImage() clips assize_t the first path from the 8BIM profile, if
+%  MagickClipImage() clips along the first path from the 8BIM profile, if
 %  present.
 %
 %  The format of the MagickClipImage method is:
@@ -1348,7 +1348,7 @@ WandExport MagickBooleanType MagickClipImage(MagickWand *wand)
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  MagickClipImagePath() clips assize_t the named paths from the 8BIM profile, if
+%  MagickClipImagePath() clips along the named paths from the 8BIM profile, if
 %  present. Later operations take effect inside the path.  Id may be a number
 %  if preceded with #, to work on a numbered path, e.g., "#1" to use the first
 %  path.
@@ -7272,7 +7272,7 @@ WandExport MagickBooleanType MagickMorphologyImageChannel(MagickWand *wand,
 %
 %    o sigma: the standard deviation of the Gaussian, in pixels.
 %
-%    o angle: Apply the effect assize_t this angle.
+%    o angle: Apply the effect along this angle.
 %
 */
 
@@ -7945,7 +7945,7 @@ WandExport MagickBooleanType MagickPingImageFile(MagickWand *wand,FILE *file)
 %
 %    o drawing_wand: the draw wand.
 %
-%    o angle: Apply the effect assize_t this angle.
+%    o angle: Apply the effect along this angle.
 %
 */
 WandExport MagickBooleanType MagickPolaroidImage(MagickWand *wand,
@@ -8153,7 +8153,7 @@ WandExport MagickBooleanType MagickPreviousImage(MagickWand *wand)
 %
 %    o dither: A value other than zero distributes the difference between an
 %      original image and the corresponding color reduced image to
-%      neighboring pixels assize_t a Hilbert curve.
+%      neighboring pixels along a Hilbert curve.
 %
 %    o measure_error: A value other than zero measures the difference between
 %      the original and quantized images.  This difference is the total
@@ -8234,7 +8234,7 @@ WandExport MagickBooleanType MagickQuantizeImage(MagickWand *wand,
 %
 %    o dither: A value other than zero distributes the difference between an
 %      original image and the corresponding color reduced algorithm to
-%      neighboring pixels assize_t a Hilbert curve.
+%      neighboring pixels along a Hilbert curve.
 %
 %    o measure_error: A value other than zero measures the difference between
 %      the original and quantized images.  This difference is the total
@@ -11268,9 +11268,9 @@ WandExport MagickBooleanType MagickShaveImage(MagickWand *wand,
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  MagickShearImage() slides one edge of an image assize_t the X or Y axis,
-%  creating a parallelogram.  An X direction shear slides an edge assize_t the X
-%  axis, while a Y direction shear slides an edge assize_t the Y axis.  The amount
+%  MagickShearImage() slides one edge of an image along the X or Y axis,
+%  creating a parallelogram.  An X direction shear slides an edge along the X
+%  axis, while a Y direction shear slides an edge along the Y axis.  The amount
 %  of the shear is controlled by a shear angle.  For X direction shears, x_shear
 %  is measured relative to the Y axis, and similarly, for Y direction shears
 %  y_shear is measured relative to the X axis.  Empty triangles left over from
@@ -11470,7 +11470,7 @@ WandExport MagickWand *MagickSimilarityImage(MagickWand *wand,
 %
 %    o sigma: the standard deviation of the Gaussian, in pixels.
 %
-%    o angle: Apply the effect assize_t this angle.
+%    o angle: Apply the effect along this angle.
 %
 */
 WandExport MagickBooleanType MagickSketchImage(MagickWand *wand,
@@ -12603,7 +12603,7 @@ WandExport MagickBooleanType MagickVignetteImage(MagickWand *wand,
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  MagickWaveImage()  creates a "ripple" effect in the image by shifting
-%  the pixels vertically assize_t a sine wave whose amplitude and wavelength
+%  the pixels vertically along a sine wave whose amplitude and wavelength
 %  is specified by the given parameters.
 %
 %  The format of the MagickWaveImage method is:
index 55ac5795f72e51abeba83dba8d6c1912faf3a3ab..db896f1e45d78f28e69a15210078e36277e21ba6 100644 (file)
@@ -47,7 +47,7 @@ extern "C" {
     } \
 }
 #define FireImageStack(postfix,advance,fire) \
-  if ((j <= i) && (i < argc)) \
+  if ((j <= i) && (i < (ssize_t) argc)) \
     { \
       if (image_stack[k].image == (Image *) NULL) \
         status&=MogrifyImageInfo(image_stack[k].image_info,(int) (i-j+1), \
index 0bb4c581e0cd8c1b9bd7142853a70353bd5b4eb2..aab7c82d41d2051a1d18c4291095da1f028487bd 100644 (file)
@@ -221,9 +221,9 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info,
       user_time=GetUserTime(timer);
       (void) fprintf(stderr,
         "Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",
-        iterations,1.0*iterations/elapsed_time,user_time,(ssize_t)
-        (elapsed_time/60.0),(ssize_t) floor(fmod(elapsed_time,60.0)),
-        (ssize_t) (1000.0*(elapsed_time-floor(elapsed_time))));
+        iterations,1.0*iterations/elapsed_time,user_time,(long)
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
     }
   timer=DestroyTimerInfo(timer);
   return(status);
@@ -336,10 +336,10 @@ static MagickBooleanType MonitorProgress(const char *text,
     locale_message=tag;
   if (p == (char *) NULL)
     (void) fprintf(stderr,"%s: %ld of %lu, %02ld%% complete\r",locale_message,
-      (ssize_t) offset,(size_t) extent,(ssize_t) (100L*offset/(extent-1)));
+      (long) offset,(size_t) extent,(long) (100L*offset/(extent-1)));
   else
     (void) fprintf(stderr,"%s[%s]: %ld of %lu, %02ld%% complete\r",
-      locale_message,p+1,(ssize_t) offset,(size_t) extent,(ssize_t)
+      locale_message,p+1,(long) offset,(size_t) extent,(long)
       (100L*offset/(extent-1)));
   if (offset == (MagickOffsetType) (extent-1))
     (void) fprintf(stderr,"\n");
@@ -641,9 +641,9 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
       continue;
     count=MagickMax(ParseMagickOption(MagickCommandOptions,MagickFalse,option),
       0L);
-    if ((i+count) >= argc)
+    if ((i+count) >= (ssize_t) argc)
       break;
-    status=MogrifyImageInfo(image_info,count+1,argv+i,exception);
+    status=MogrifyImageInfo(image_info,(int) count+1,argv+i,exception);
     switch (*(option+1))
     {
       case 'a':
@@ -3632,9 +3632,9 @@ static MagickBooleanType MogrifyUsage(void)
       "-charcoal radius     simulate a charcoal drawing",
       "-chop geometry       remove pixels from the image interior",
       "-clamp               restrict pixel range from 0 to the quantum depth",
-      "-clip                clip assize_t the first path from the 8BIM profile",
+      "-clip                clip along the first path from the 8BIM profile",
       "-clip-mask filename  associate a clip mask with the image",
-      "-clip-path id        clip assize_t a named path from the 8BIM profile",
+      "-clip-path id        clip along a named path from the 8BIM profile",
       "-colorize value      colorize the image with the fill color",
       "-color-matrix matrix apply color correction to the image",
       "-contrast            enhance or reduce the image contrast",
@@ -3724,7 +3724,7 @@ static MagickBooleanType MogrifyUsage(void)
       "-shadow geometry     simulate an image shadow",
       "-sharpen geometry    sharpen the image",
       "-shave geometry      shave pixels from the image edges",
-      "-shear geometry      slide one edge of the image assize_t the X or Y axis",
+      "-shear geometry      slide one edge of the image along the X or Y axis",
       "-sigmoidal-contrast geometry",
       "                     increase the contrast without saturating highlights or shadows",
       "-sketch geometry     simulate a pencil sketch",
@@ -3748,7 +3748,7 @@ static MagickBooleanType MogrifyUsage(void)
       "-unique-colors       discard all but one of any pixel color",
       "-unsharp geometry    sharpen the image",
       "-vignette geometry   soften the edges of the image in vignette style",
-      "-wave geometry       alter an image assize_t a sine wave",
+      "-wave geometry       alter an image along a sine wave",
       "-white-threshold value",
       "                     force all pixels above the threshold into white",
       (char *) NULL
@@ -4044,7 +4044,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
         */
         FireImageStack(MagickFalse,MagickFalse,pend);
         filename=argv[i];
-        if ((LocaleCompare(filename,"--") == 0) && (i < (argc-1)))
+        if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1)))
           filename=argv[++i];
         (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
         images=ReadImages(image_info,exception);
@@ -6342,7 +6342,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
   }
   if (k != 0)
     ThrowMogrifyException(OptionError,"UnbalancedParenthesis",argv[i]);
-  if (i != argc)
+  if (i != (ssize_t) argc)
     ThrowMogrifyException(OptionError,"MissingAnImageFilename",argv[i]);
   DestroyMogrify();
   return(status != 0 ? MagickTrue : MagickFalse);
@@ -6415,7 +6415,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
       continue;
     count=MagickMax(ParseMagickOption(MagickCommandOptions,MagickFalse,option),
       0L);
-    if ((i+count) >= argc)
+    if ((i+count) >= (ssize_t) argc)
       break;
     switch (*(option+1))
     {
@@ -7570,9 +7570,9 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
       continue;
     count=MagickMax(ParseMagickOption(MagickCommandOptions,MagickFalse,option),
       0L);
-    if ((i+count) >= argc)
+    if ((i+count) >= (ssize_t) argc)
       break;
-    status=MogrifyImageInfo(image_info,count+1,argv+i,exception);
+    status=MogrifyImageInfo(image_info,(int) count+1,argv+i,exception);
     switch (*(option+1))
     {
       case 'a':
index 60149801dc13eebb85b546da3a84e229e2f51832..e3d9012150f3214709e172e18c5e48eb4807846a 100644 (file)
@@ -292,11 +292,13 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
   ImageStack
     image_stack[MaxImageStackDepth+1];
 
-  ssize_t
+  long
     first_scene,
+    last_scene;
+
+  ssize_t
     j,
     k,
-    last_scene,
     scene;
 
   MagickBooleanType
@@ -382,7 +384,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
           *images;
 
         FireImageStack(MagickFalse,MagickFalse,pend);
-        for (scene=first_scene; scene <= last_scene ; scene++)
+        for (scene=(ssize_t) first_scene; scene <= (ssize_t) last_scene ; scene++)
         {
           char
             *filename;
@@ -391,7 +393,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             Option is a file name: begin by reading image from specified file.
           */
           filename=argv[i];
-          if ((LocaleCompare(filename,"--") == 0) && (i < (argc-1)))
+          if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1)))
             filename=argv[++i];
           (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
           if (first_scene != last_scene)
@@ -1389,7 +1391,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
               ThrowMontageException(OptionError,"MissingArgument",option);
             if (IsSceneGeometry(argv[i],MagickFalse) == MagickFalse)
               ThrowMontageInvalidArgumentException(option,argv[i]);
-            first_scene=StringToLong(argv[i]);
+            first_scene=(int) StringToLong(argv[i]);
             last_scene=first_scene;
             (void) sscanf(argv[i],"%ld-%ld",&first_scene,&last_scene);
             break;
index 430455c78e667654542a8ba93356b5b453c50fc2..6621aec35d3de5ffd7ff458282356435f9bea3ed 100644 (file)
@@ -265,13 +265,15 @@ WandExport MagickBooleanType DuplexTransferPixelViewIterator(
     *duplex_image,
     *source_image;
 
-  ssize_t
-    progress,
-    y;
-
   MagickBooleanType
     status;
 
+  MagickOffsetType
+    progress;
+
+  ssize_t
+    y;
+
   assert(source != (PixelView *) NULL);
   assert(source->signature == WandSignature);
   if (transfer == (DuplexTransferPixelViewMethod) NULL)
@@ -530,13 +532,15 @@ WandExport MagickBooleanType GetPixelViewIterator(PixelView *source,
   Image
     *source_image;
 
-  ssize_t
-    progress,
-    y;
-
   MagickBooleanType
     status;
 
+  MagickOffsetType
+    progress;
+
+  ssize_t
+    y;
+
   assert(source != (PixelView *) NULL);
   assert(source->signature == WandSignature);
   if (get == (GetPixelViewMethod) NULL)
@@ -973,13 +977,15 @@ WandExport MagickBooleanType SetPixelViewIterator(PixelView *destination,
   Image
     *destination_image;
 
-  ssize_t
-    progress,
-    y;
-
   MagickBooleanType
     status;
 
+  MagickOffsetType
+    progress;
+
+  ssize_t
+    y;
+
   assert(destination != (PixelView *) NULL);
   assert(destination->signature == WandSignature);
   if (set == (SetPixelViewMethod) NULL)
@@ -1106,13 +1112,15 @@ WandExport MagickBooleanType TransferPixelViewIterator(PixelView *source,
     *destination_image,
     *source_image;
 
-  ssize_t
-    progress,
-    y;
-
   MagickBooleanType
     status;
 
+  MagickOffsetType
+    progress;
+
+  ssize_t
+    y;
+
   assert(source != (PixelView *) NULL);
   assert(source->signature == WandSignature);
   if (transfer == (TransferPixelViewMethod) NULL)
@@ -1265,13 +1273,15 @@ WandExport MagickBooleanType UpdatePixelViewIterator(PixelView *source,
   Image
     *source_image;
 
-  ssize_t
-    progress,
-    y;
-
   MagickBooleanType
     status;
 
+  MagickOffsetType
+    progress;
+
+  ssize_t
+    y;
+
   assert(source != (PixelView *) NULL);
   assert(source->signature == WandSignature);
   if (update == (UpdatePixelViewMethod) NULL)
index 877e5c3c9dca6dd3ac7edb518baf83f2f9825b70..362253d60f184d3a5328a3f9573e63412097e779 100644 (file)
@@ -289,7 +289,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
         */
         FireImageStack(MagickFalse,MagickFalse,pend);
         filename=argv[i];
-        if ((LocaleCompare(filename,"--") == 0) && (i < (argc-1)))
+        if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1)))
           filename=argv[++i];
         (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
         images=StreamImage(image_info,stream_info,exception);
index 86e554acfff4c8182dd219d49363c1b3e07cd9af..3f31795fc399a199d1cdbbf99a3289e8536c2f8e 100644 (file)
@@ -400,9 +400,6 @@ int main(int argc,char **argv)
   register ssize_t
     i;
 
-  size_t
-    length;
-
   unsigned char
     *profile;
 
@@ -412,6 +409,7 @@ int main(int argc,char **argv)
   size_t
     columns,
     delay,
+    length,
     number_options,
     number_profiles,
     number_properties,
@@ -454,11 +452,11 @@ int main(int argc,char **argv)
   (void) fprintf(stdout,"Iterate forward...\n");
   MagickResetIterator(magick_wand);
   while (MagickNextImage(magick_wand) != MagickFalse)
-    (void) fprintf(stdout,"index %ld scene %lu\n",
+    (void) fprintf(stdout,"index %ld scene %lu\n",(long)
       MagickGetIteratorIndex(magick_wand),MagickGetImageScene(magick_wand));
   (void) fprintf(stdout,"Iterate reverse...\n");
   while (MagickPreviousImage(magick_wand) != MagickFalse)
-    (void) fprintf(stdout,"index %ld scene %lu\n",
+    (void) fprintf(stdout,"index %ld scene %lu\n",(long)
       MagickGetIteratorIndex(magick_wand),MagickGetImageScene(magick_wand));
   (void) fprintf(stdout,"Remove scene 1...\n");
   (void) MagickSetIteratorIndex(magick_wand,1);
@@ -468,7 +466,7 @@ int main(int argc,char **argv)
     ThrowAPIException(magick_wand);
   MagickResetIterator(magick_wand);
   while (MagickNextImage(magick_wand) != MagickFalse)
-    (void) fprintf(stdout,"index %ld scene %lu\n",
+    (void) fprintf(stdout,"index %ld scene %lu\n",(long)
       MagickGetIteratorIndex(magick_wand),MagickGetImageScene(magick_wand));
   (void) fprintf(stdout,"Insert scene 1 back in sequence...\n");
   (void) MagickSetIteratorIndex(magick_wand,0);
@@ -477,7 +475,7 @@ int main(int argc,char **argv)
     ThrowAPIException(magick_wand);
   MagickResetIterator(magick_wand);
   while (MagickNextImage(magick_wand) != MagickFalse)
-    (void) fprintf(stdout,"index %ld scene %lu\n",
+    (void) fprintf(stdout,"index %ld scene %lu\n",(long)
       MagickGetIteratorIndex(magick_wand),MagickGetImageScene(magick_wand));
   (void) fprintf(stdout,"Set scene 2 to scene 1...\n");
   (void) MagickSetIteratorIndex(magick_wand,2);
@@ -487,7 +485,7 @@ int main(int argc,char **argv)
     ThrowAPIException(magick_wand);
   MagickResetIterator(magick_wand);
   while (MagickNextImage(magick_wand) != MagickFalse)
-    (void) fprintf(stdout,"index %ld scene %lu\n",
+    (void) fprintf(stdout,"index %ld scene %lu\n",(long)
       MagickGetIteratorIndex(magick_wand),MagickGetImageScene(magick_wand));
   (void) fprintf(stdout,"Apply image processing options...\n");
   status=MagickCropImage(magick_wand,60,60,10,10);
@@ -567,8 +565,8 @@ int main(int argc,char **argv)
   MagickResetIterator(magick_wand);
   while (MagickNextImage(magick_wand) != MagickFalse)
   {
-    MagickSetImageDepth(magick_wand,8);
-    MagickSetImageCompression(magick_wand,RLECompression);
+    (void) MagickSetImageDepth(magick_wand,8);
+    (void) MagickSetImageCompression(magick_wand,RLECompression);
   }
   MagickResetIterator(magick_wand);
   (void) MagickSetIteratorIndex(magick_wand,4);