about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2016-06-26 17:06:04 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2016-06-26 17:06:04 +0000
commitc0a081a4f8166e3f1195725df2d2b41bb3dc3a4f (patch)
treecd3848ab355d455d34d1bec2463c3a12b4e3d30f
parentb0c93b9da33a9ad1d81418b69632480610e83dde (diff)
downloadnetpbm-mirror-c0a081a4f8166e3f1195725df2d2b41bb3dc3a4f.tar.gz
netpbm-mirror-c0a081a4f8166e3f1195725df2d2b41bb3dc3a4f.tar.xz
netpbm-mirror-c0a081a4f8166e3f1195725df2d2b41bb3dc3a4f.zip
Release 10.73.03
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@2797 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY6
-rw-r--r--other/pamarith.c10
-rw-r--r--version.mk2
3 files changed, 12 insertions, 6 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 6dbae764..d5c93729 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,12 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+16.06.26 BJH  Release 10.73.03
+
+              pamarith: fix incorrect output when maxvals differ, for
+              -add, -multiply, -mean, -min, -max.  Broken in Neptbm 10.41
+              (December 2007).
+
 16.06.12 BJH  Release 10.73.02
 
               pbmtextps: Abort with error instead of generating single space
diff --git a/other/pamarith.c b/other/pamarith.c
index b64f69fb..54c18485 100644
--- a/other/pamarith.c
+++ b/other/pamarith.c
@@ -265,7 +265,7 @@ computeOutputType(struct pam *  const outpamP,
 
 
 
-static sample
+static samplen
 samplenSum(samplen      const operands[],
            unsigned int const operandCt) {
 
@@ -282,7 +282,7 @@ samplenSum(samplen      const operands[],
 
 
 
-static sample
+static samplen
 samplenMin(samplen      const operands[],
            unsigned int const operandCt) {
 
@@ -298,7 +298,7 @@ samplenMin(samplen      const operands[],
 
 
 
-static sample
+static samplen
 samplenMax(samplen      const operands[],
            unsigned int const operandCt) {
 
@@ -314,7 +314,7 @@ samplenMax(samplen      const operands[],
 
 
 
-static sample
+static samplen
 samplenMean(samplen      const operands[],
             unsigned int const operandCt) {
 
@@ -329,7 +329,7 @@ samplenMean(samplen      const operands[],
 
 
 
-static sample
+static samplen
 samplenProduct(samplen      const operands[],
                unsigned int const operandCt) {
 
diff --git a/version.mk b/version.mk
index d3b4734f..d54d63ed 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 73
-NETPBM_POINT_RELEASE = 2
+NETPBM_POINT_RELEASE = 3