about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-05-04 02:32:17 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-05-04 02:32:17 +0000
commit380a0d12362ca71174e04e535de1970e7287c31b (patch)
tree2e1cfd376a952cc26c6915573aebd4a30f2fdf56
parent02cefc20e87ed0406131c4bf2e9b3648bc8adcf5 (diff)
downloadnetpbm-mirror-380a0d12362ca71174e04e535de1970e7287c31b.tar.gz
netpbm-mirror-380a0d12362ca71174e04e535de1970e7287c31b.tar.xz
netpbm-mirror-380a0d12362ca71174e04e535de1970e7287c31b.zip
Release 10.47.13
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1205 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/other/pnmtops.c2
-rw-r--r--doc/HISTORY5
-rw-r--r--version.mk2
3 files changed, 8 insertions, 1 deletions
diff --git a/converter/other/pnmtops.c b/converter/other/pnmtops.c
index b43cb483..1568bd28 100644
--- a/converter/other/pnmtops.c
+++ b/converter/other/pnmtops.c
@@ -1001,6 +1001,8 @@ computeDepth(xelval         const inputMaxval,
         *bitspersampleP = 2;
     else if (bitsRequiredByMaxval <= 4)
         *bitspersampleP = 4;
+    else if (bitsRequiredByMaxval <= 8)
+        *bitspersampleP = 8;
     else {
         /* Post script level 2 defines a format with 12 bits per sample,
            but I don't know the details of that format (both RLE and
diff --git a/doc/HISTORY b/doc/HISTORY
index 060ce00f..8c4e5ba0 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+10.05.04 BJH  Release 10.47.13
+
+              pnmtops: fix bug: 12 bits per sample output when 8 would do.
+              Introduced in 10.40.
+
 10.04.20 BJH  Release 10.47.12
 
               palmtopnm: fix for pixel size 16.  Thanks Paul Bolle
diff --git a/version.mk b/version.mk
index 55b55270..4c35bef5 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 47
-NETPBM_POINT_RELEASE = 12
+NETPBM_POINT_RELEASE = 13