From 97db38a99781e925695eb451fa9f38f278d668c6 Mon Sep 17 00:00:00 2001
From: Michael Jennings <mej@kainx.org>
Date: Wed, 5 Jan 2000 14:28:49 +0000
Subject: [PATCH] Don't ask me how this got out of sync....

SVN revision: 1857
---
 loaders/loader_gif.c | 58 +++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/loaders/loader_gif.c b/loaders/loader_gif.c
index cdcaaeb..af8df31 100644
--- a/loaders/loader_gif.c
+++ b/loaders/loader_gif.c
@@ -62,36 +62,38 @@ load(ImlibImage *im, progress_func *progress, char progress_granularity, char im
       }
       w = gif->Image.Width;
       h = gif->Image.Height;
-      rows = malloc(h * sizeof(GifRowType *));
-      if (!rows) {
-        DGifCloseFile(gif);
-        return 0;
-      }
-      for (i = 0; i < h; i++) {
-        rows[i] = NULL;
-      }
-      for (i = 0; i < h; i++) {
-        rows[i] = malloc(w * sizeof(GifPixelType));
-        if (!rows[i]) {
+      if (im->loader || immediate_load || progress) {
+        rows = malloc(h * sizeof(GifRowType *));
+        if (!rows) {
           DGifCloseFile(gif);
-          for (i = 0; i < h; i++) {
-            if (rows[i]) {
-              free(rows[i]);
-            }
-          }
-          free(rows);
           return 0;
         }
-      }
-      if (gif->Image.Interlace) {
-        for (i = 0; i < 4; i++) {
-          for (j = intoffset[i]; j < h; j += intjump[i]) {
-            DGifGetLine(gif, rows[j], w);
+        for (i = 0; i < h; i++) {
+          rows[i] = NULL;
+        }
+        for (i = 0; i < h; i++) {
+          rows[i] = malloc(w * sizeof(GifPixelType));
+          if (!rows[i]) {
+            DGifCloseFile(gif);
+            for (i = 0; i < h; i++) {
+              if (rows[i]) {
+                free(rows[i]);
+              }
+            }
+            free(rows);
+            return 0;
           }
         }
-      } else {
-        for (i = 0; i < h; i++) {
-          DGifGetLine(gif, rows[i], w);
+        if (gif->Image.Interlace) {
+          for (i = 0; i < 4; i++) {
+            for (j = intoffset[i]; j < h; j += intjump[i]) {
+              DGifGetLine(gif, rows[j], w);
+            }
+          }
+        } else {
+          for (i = 0; i < h; i++) {
+            DGifGetLine(gif, rows[i], w);
+          }
         }
       }
       done = 1;
@@ -154,9 +156,9 @@ load(ImlibImage *im, progress_func *progress, char progress_granularity, char im
         }
       }
     }
-  }
-  if (progress) {
-    progress(im, 100, 0, last_y, w, h);
+    if (progress) {
+      progress(im, 100, 0, last_y, w, h);
+    }
   }
   DGifCloseFile(gif);
   for (i = 0; i < h; i++) {