about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2022-01-12 03:25:09 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2022-01-12 03:25:09 +0000
commit7363c9a203f82c172be2a06356eb8a2bdf0833a4 (patch)
tree3a91b49e43d0b40d77da8d78cf57725301be8933
parent1a18acd6b6178ce81340c42143a36e789ba13c75 (diff)
downloadnetpbm-mirror-7363c9a203f82c172be2a06356eb8a2bdf0833a4.tar.gz
netpbm-mirror-7363c9a203f82c172be2a06356eb8a2bdf0833a4.tar.xz
netpbm-mirror-7363c9a203f82c172be2a06356eb8a2bdf0833a4.zip
Release 10.97.02
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4242 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/ppm/ppmtoilbm.c1
-rw-r--r--doc/HISTORY7
-rw-r--r--version.mk2
3 files changed, 8 insertions, 2 deletions
diff --git a/converter/ppm/ppmtoilbm.c b/converter/ppm/ppmtoilbm.c
index 595aa3f4..c5fa4d00 100644
--- a/converter/ppm/ppmtoilbm.c
+++ b/converter/ppm/ppmtoilbm.c
@@ -2274,6 +2274,7 @@ main(int argc, char ** argv) {
         if (colors == 0)
             pm_error("empty colormap??");
         pm_message("%d colors found in colormap", colors);
+        nPlanes = pm_maxvaltobits(colors-1);
     }
 
     if (maskmethod != mskNone) {
diff --git a/doc/HISTORY b/doc/HISTORY
index 6093817a..d6d9e7df 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,7 +4,12 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
-not yet  BJH  Release 10.98.00
+22.01.11 BJH  Release 10.97.02
+
+              ppmtoilbm: Fix wild memory references and hangs with -map .
+              Introduced in Netpbm 9.12 (March 2001).
+
+22.01.09 BJH  Release 10.97.01
  
               picttoppm: Fix incorrect output for 32 bit per pixel images
               that have only 3 planes.  Broken in Netpbm 10.34 (June 2006).
diff --git a/version.mk b/version.mk
index 41870e8a..35bfc41b 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 97
-NETPBM_POINT_RELEASE = 1
+NETPBM_POINT_RELEASE = 2