about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2011-11-08 16:13:18 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2011-11-08 16:13:18 +0000
commit710952ec33cb9428f444bc2bcd4d29a1d24c5899 (patch)
tree50cac89c8c1cb6e96aeea35000fd92ce0ab52fe5
parent7f9ddfb76b7697992e57708215f28c98235c5669 (diff)
downloadnetpbm-mirror-710952ec33cb9428f444bc2bcd4d29a1d24c5899.tar.gz
netpbm-mirror-710952ec33cb9428f444bc2bcd4d29a1d24c5899.tar.xz
netpbm-mirror-710952ec33cb9428f444bc2bcd4d29a1d24c5899.zip
Release 10.47.32
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1595 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY5
-rw-r--r--other/pamarith.c2
-rw-r--r--version.mk2
3 files changed, 7 insertions, 2 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index ed330e73..58b26f62 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,10 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+11.11.08 BJH  Release 10.47.32
+
+              pamarith: fix wrong result with -multiply.  Broken in 10.41.
+
 11.09.25 BJH  Release 10.47.31
 
               bmptopnm: Fail properly with BMP that indicates an illegal bits
@@ -11,6 +15,7 @@ CHANGE HISTORY
 
               pnmtops: fix message: says "from top edge" where it means
               "from bottom edge."
+11.09.28 BJH  Release 10.56.00
 
 11.08.22 BJH  Release 10.47.30
 
diff --git a/other/pamarith.c b/other/pamarith.c
index d8ea19fa..4374ee1c 100644
--- a/other/pamarith.c
+++ b/other/pamarith.c
@@ -523,7 +523,7 @@ sampleProduct(sample       const operands[],
     double product;
 
     for (i = 0, product = 1.0; i < operandCt; ++i) {
-        product *= ((double)operands[0]/maxval);
+        product *= ((double)operands[i]/maxval);
     }
     return (sample)(product * maxval + 0.5);
 }
diff --git a/version.mk b/version.mk
index 178688b7..d1b10c03 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 47
-NETPBM_POINT_RELEASE = 31
+NETPBM_POINT_RELEASE = 32