about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2018-06-27 02:07:35 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2018-06-27 02:07:35 +0000
commit84c6e11810783388e5be22ab80a5dafe523f20db (patch)
treec078e95908fa7d1b37b80695a87ff37ecf8e0862
parent404092adffe5ad02da2586022b97fe2994831c21 (diff)
downloadnetpbm-mirror-84c6e11810783388e5be22ab80a5dafe523f20db.tar.gz
netpbm-mirror-84c6e11810783388e5be22ab80a5dafe523f20db.tar.xz
netpbm-mirror-84c6e11810783388e5be22ab80a5dafe523f20db.zip
Release 10.47.69
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@3270 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/ppm/ilbmtoppm.c2
-rw-r--r--doc/HISTORY7
-rw-r--r--version.mk2
3 files changed, 10 insertions, 1 deletions
diff --git a/converter/ppm/ilbmtoppm.c b/converter/ppm/ilbmtoppm.c
index 5ceb70b6..209f53c0 100644
--- a/converter/ppm/ilbmtoppm.c
+++ b/converter/ppm/ilbmtoppm.c
@@ -404,6 +404,8 @@ read_clut(FILE *        const ifp,
         unsigned long remainingChunksize;
         unsigned int i;
 
+        remainingChunksize = chunksize;  /* initial value */
+
         type = get_big_long(ifp, iffid, &remainingChunksize);
         get_big_long(ifp, iffid, &remainingChunksize); /* skip reserved fld */
 
diff --git a/doc/HISTORY b/doc/HISTORY
index 4142d4a6..83dec462 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,13 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+18.06.27 BJH  Release 10.47.69
+
+              ilbmtoppm: Fix bug: may fail with bogus error message about an
+              invalid CLUT chunk if image has a CLUT chunk.  Introduced after
+              Netpbm 10.26 (January 2005) and at or before Netpbm 10.35
+              (August 2006).
+
 18.03.25 BJH  Release 10.47.68
 
               g3topbm: Fix bug - produces invalid empty PBM image if input
diff --git a/version.mk b/version.mk
index 1537a017..2173a243 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 47
-NETPBM_POINT_RELEASE = 68
+NETPBM_POINT_RELEASE = 69