diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2023-08-02 16:43:10 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2023-08-02 16:43:10 +0000 |
| commit | e3b6993ea733d50b7a05fadb9d6ef2f6a07ad3d7 (patch) | |
| tree | 614d025920036de2ee23242a6160af14833f7c19 | |
| parent | 341f87d067f5cb46683ae31944e9c31f1cc51e1d (diff) | |
| download | netpbm-mirror-e3b6993ea733d50b7a05fadb9d6ef2f6a07ad3d7.tar.gz netpbm-mirror-e3b6993ea733d50b7a05fadb9d6ef2f6a07ad3d7.tar.xz netpbm-mirror-e3b6993ea733d50b7a05fadb9d6ef2f6a07ad3d7.zip | |
Release 11.03.01
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4570 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | doc/HISTORY | 8 | ||||
| -rw-r--r-- | other/pamstack.c | 9 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index 2a410c14..fed027ed 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,14 @@ Netpbm. CHANGE HISTORY -------------- +23.08.02 BJH Release 11.03.01 + + pamstack: fix bug: acts like -firstmaxval specified when it + wasn't. Introduced in Netpbm 11.03 (June 2023). + + pamstack: fix -lcmmaxval: chooses wrong maxval. Always + broken (-lcmmaxval was new in Netpbm 11.03 (June 2023)). + 23.06.28 BJH Release 11.03.00 pamstack: Add -firstmaxval, -lcmmaxval diff --git a/other/pamstack.c b/other/pamstack.c index 75b66cb7..3f974a3a 100644 --- a/other/pamstack.c +++ b/other/pamstack.c @@ -236,8 +236,8 @@ processOneImageInAllStreams(unsigned int const nInput, if (inpam[inputSeq].maxval != inpam[0].maxval) allImagesSameMaxval = false; - maxvalLcm = pm_lcm(maxvalLcm, inpam[inputSeq].maxval, 1, - PAM_OVERALL_MAXVAL); + maxvalLcm = pm_lcm(maxvalLcm + 1, inpam[inputSeq].maxval + 1, 1, + PAM_OVERALL_MAXVAL) - 1; outputDepth += inpam[inputSeq].depth; } @@ -247,9 +247,8 @@ processOneImageInAllStreams(unsigned int const nInput, switch (maxvalScaling) { case MAXVALSCALE_NONE: if (!allImagesSameMaxval) - pm_message("Inputs do not all have same maxval. " - "Consider -firstmaxval or -lcmmaxval"); - outpam.maxval = inpam[0].maxval; + pm_error("Inputs do not all have same maxval. " + "Consider -firstmaxval or -lcmmaxval"); break; case MAXVALSCALE_FIRST: outpam.maxval = inpam[0].maxval; diff --git a/version.mk b/version.mk index 5f0c0544..feae3b21 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 11 NETPBM_MINOR_RELEASE = 3 -NETPBM_POINT_RELEASE = 0 +NETPBM_POINT_RELEASE = 1 |