(no commit message)

[imagemagick] / coders / pwp.c

diff --git a/coders/pwp.c b/coders/pwp.c
index 2e4eb210e2fbca7d9ef77f38baa112940cc6cfc0..02f71419b4db10f9bf240a6fbdcd41e6a250d2eb 100644 (file)
--- a/coders/pwp.c
+++ b/coders/pwp.c
@@ -17,7 +17,7 @@
 %                                 July 1992                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -142,18 +142,19 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception)
   register Image
     *p;
 
-  register long
+  register ssize_t
     i;
 
+  size_t
+    filesize,
+    length;
+
   ssize_t
     count;
 
   unsigned char
     magick[MaxTextExtent];
 
-  unsigned long
-    filesize;
-
   /*
     Open image file.
   */
@@ -204,9 +205,10 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception)
         image=DestroyImageList(image);
         return((Image *) NULL);
       }
-    (void) fwrite("SFW94A",1,6,file);
+    length=fwrite("SFW94A",1,6,file);
+    (void) length;
     filesize=65535UL*magick[2]+256L*magick[1]+magick[0];
-    for (i=0; i < (long) filesize; i++)
+    for (i=0; i < (ssize_t) filesize; i++)
     {
       c=ReadBlobByte(pwp_image);
       (void) fputc(c,file);
@@ -216,7 +218,7 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if (next_image == (Image *) NULL)
       break;
     (void) FormatMagickString(next_image->filename,MaxTextExtent,
-      "slide_%02ld.sfw",next_image->scene);
+      "slide_%02ld.sfw",(long) next_image->scene);
     if (image == (Image *) NULL)
       image=next_image;
     else
@@ -275,10 +277,10 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception)
 %
 %  The format of the RegisterPWPImage method is:
 %
-%      unsigned long RegisterPWPImage(void)
+%      size_t RegisterPWPImage(void)
 %
 */
-ModuleExport unsigned long RegisterPWPImage(void)
+ModuleExport size_t RegisterPWPImage(void)
 {
   MagickInfo
     *entry;