reverted invalid usage of GET*/PUT* macros

[libucw.git] / images / io-libungif.c

diff --git a/images/io-libungif.c b/images/io-libungif.c
index 3faf6c51bd5f8637c6a211214284b73799d5a332..45940edee2f052f9f5d4edd0f937717c50d0bc86 100644 (file)
--- a/images/io-libungif.c
+++ b/images/io-libungif.c
@@ -26,14 +26,7 @@ static int
 libungif_read_func(GifFileType *gif, GifByteType *ptr, int len)
 {
   DBG("libungif_read_func(len=%d)", len);
-  uns readed, total = 0;
-  while (len && (readed = bread((struct fastbuf *)gif->UserData, (byte *)ptr, len)))
-    {
-      len -= readed;
-      ptr += readed;
-      total += readed;
-    }
-  return total;
+  return bread((struct fastbuf *)gif->UserData, (byte *)ptr, len);
 }
 
 static void
@@ -41,7 +34,8 @@ libungif_read_cancel(struct image_io *io)
 {
   DBG("libungif_read_cancel()");
 
-  DGifCloseFile(io->read_data);
+  struct libungif_read_data *rd = io->read_data;
+  DGifCloseFile(rd->gif);
 }
 
 int