about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2018-01-05 03:47:03 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2018-01-05 03:47:03 +0000
commit4e026d12139bb3ea85a6c5c70c51f8dbebcfe524 (patch)
tree0bcce393d7644a7872884cb266b56cb2dd3ee656
parent8c46a4c67e321801d99078a7fb22af6a20e4aa7b (diff)
downloadnetpbm-mirror-4e026d12139bb3ea85a6c5c70c51f8dbebcfe524.tar.gz
netpbm-mirror-4e026d12139bb3ea85a6c5c70c51f8dbebcfe524.tar.xz
netpbm-mirror-4e026d12139bb3ea85a6c5c70c51f8dbebcfe524.zip
Release 10.81.01
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@3108 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY5
-rw-r--r--generator/ppmpat.c2
-rw-r--r--version.mk2
3 files changed, 7 insertions, 2 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 65d51e94..f8039c26 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+18.01.05 BJH  Release 10.81.01
+
+              ppmpat: Fix bug - crash or junk output with -camo or -anticamo
+              and no -color.  Introduced in Netpbm 10.78 (March 2017).
+
 17.12.30 BJH  Release 10.81.00
 
               sldtoppm: -lib and -dir don't work - always says slide not
diff --git a/generator/ppmpat.c b/generator/ppmpat.c
index f4b066ee..6d9cb1ca 100644
--- a/generator/ppmpat.c
+++ b/generator/ppmpat.c
@@ -650,7 +650,7 @@ camo(pixel **     const pixels,
 
     clearBackgroundCamo(pixels, cols, rows, maxval, colorTableP, antiflag);
 
-    if (colorTableP) {
+    if (colorTableP->count > 0) {
         assert(colorTableP->count > 1);
         colorTableP->index = 1;  /* Foreground colors start at 1 */
     }
diff --git a/version.mk b/version.mk
index 431ba191..17391d82 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 81
-NETPBM_POINT_RELEASE = 0
+NETPBM_POINT_RELEASE = 1