(no commit message)

[imagemagick] / coders / mono.c

diff --git a/coders/mono.c b/coders/mono.c
index cdef20e349dab2103b05a41bf031e32331819d73..b2642df5fd59b2e274146be10d29321a8f9a6a31 100644 (file)
--- a/coders/mono.c
+++ b/coders/mono.c
@@ -114,9 +114,6 @@ static Image *ReadMONOImage(const ImageInfo *image_info,
   register PixelPacket
     *q;
 
-  register ssize_t
-    i;
-
   size_t
     bit,
     byte;
@@ -140,13 +137,9 @@ static Image *ReadMONOImage(const ImageInfo *image_info,
       image=DestroyImageList(image);
       return((Image *) NULL);
     }
-  for (i=0; i < image->offset; i++)
-    if (ReadBlobByte(image) == EOF)
-      {
-        ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
-          image->filename);
-        break;
-      }
+  if (DiscardBlobBytes(image,image->offset) == MagickFalse)
+    ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
+      image->filename);
   /*
     Initialize image colormap.
   */
@@ -184,7 +177,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 +349,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;
   }