From a7e8afc8f2f90e55be9df6563b4ef0cc545b74b5 Mon Sep 17 00:00:00 2001
From: corvid <corvid@lavabit.com>
Date: Tue, 28 Apr 2009 08:45:47 -0400
Subject: Regression fix: make scaled multiscan images work again.

---
 src/dicache.c |  1 +
 src/image.cc  | 11 -----------
 src/image.hh  |  1 -
 src/imgbuf.cc |  8 ++++++++
 src/imgbuf.hh |  2 +-
 5 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/dicache.c b/src/dicache.c
index 00bc5204..2a86810a 100644
--- a/src/dicache.c
+++ b/src/dicache.c
@@ -325,6 +325,7 @@ void a_Dicache_new_scan(const DilloUrl *url, int version)
    }
    a_Bitvec_clear(DicEntry->BitVec);
    DicEntry->ScanNumber++;
+   a_Imgbuf_new_scan(DicEntry->v_imgbuf);
 }
 
 /*
diff --git a/src/image.cc b/src/image.cc
index 2dd7fc40..63d630c7 100644
--- a/src/image.cc
+++ b/src/image.cc
@@ -101,17 +101,6 @@ void a_Image_set_parms(DilloImage *Image, void *v_imgbuf, DilloUrl *url,
    Image->State = IMG_SetParms;
 }
 
-/*
- * Begin a new scan for a multiple-scan image
- */
-void a_Image_new_scan(DilloImage *Image, void *v_imgbuf)
-{
-   _MSG("a_Image_new_scan\n");
-   a_Bitvec_clear(Image->BitVec);
-   Image->ScanNumber++;
-   ((Imgbuf*)v_imgbuf)->newScan();
-}
-
 /*
  * Implement the write method
  */
diff --git a/src/image.hh b/src/image.hh
index 8e8c89c5..542147bc 100644
--- a/src/image.hh
+++ b/src/image.hh
@@ -58,7 +58,6 @@ void a_Image_unref(DilloImage *Image);
 void a_Image_set_parms(DilloImage *Image, void *v_imgbuf, DilloUrl *url,
                        int version, uint_t width, uint_t height,
                        DilloImgType type);
-void a_Image_new_scan(DilloImage *image, void *v_imgbuf);
 void a_Image_write(DilloImage *Image, uint_t y);
 void a_Image_close(DilloImage *Image);
 
diff --git a/src/imgbuf.cc b/src/imgbuf.cc
index ee8f918a..f5883606 100644
--- a/src/imgbuf.cc
+++ b/src/imgbuf.cc
@@ -115,3 +115,11 @@ void a_Imgbuf_update(void *v_imgbuf, const uchar_t *buf, DilloImgType type,
    ((Imgbuf*)v_imgbuf)->copyRow(y, (byte *)newbuf);
 }
 
+/*
+ * Reset for a new scan from a multiple-scan image.
+ */
+void a_Imgbuf_new_scan(void *v_imgbuf)
+{
+   ((Imgbuf*)v_imgbuf)->newScan();
+}
+
diff --git a/src/imgbuf.hh b/src/imgbuf.hh
index 3cab68a0..9a6e3ff7 100644
--- a/src/imgbuf.hh
+++ b/src/imgbuf.hh
@@ -20,7 +20,7 @@ void *a_Imgbuf_new(void *v_dw, int img_type, uint_t width, uint_t height);
 int a_Imgbuf_last_reference(void *v_imgbuf);
 void a_Imgbuf_update(void *v_imgbuf, const uchar_t *buf, DilloImgType type,
                      uchar_t *cmap, uint_t width, uint_t height, uint_t y);
-
+void a_Imgbuf_new_scan(void *v_imgbuf);
 
 #ifdef __cplusplus
 }
-- 
cgit v1.2.3