diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-04-11 14:26:08 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-04-11 14:26:08 +0000 |
| commit | 8cac00fc3fc159026bad2efa68e667415ac5ccb1 (patch) | |
| tree | 556e5950a51bc6ffc76bb1b0a1389dcf850185c1 | |
| parent | e0d2390ff2ed3e51673343cec1033d2a041f5e3f (diff) | |
| download | netpbm-mirror-8cac00fc3fc159026bad2efa68e667415ac5ccb1.tar.gz netpbm-mirror-8cac00fc3fc159026bad2efa68e667415ac5ccb1.tar.xz netpbm-mirror-8cac00fc3fc159026bad2efa68e667415ac5ccb1.zip | |
Release 10.35.42
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@614 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | Makefile.version | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 4 | ||||
| -rw-r--r-- | editor/pnmnorm.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.version b/Makefile.version index 219a16c3..4ea55b22 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 35 -NETPBM_POINT_RELEASE = 41 +NETPBM_POINT_RELEASE = 42 diff --git a/doc/HISTORY b/doc/HISTORY index efc8188e..985dc398 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,10 @@ Netpbm. CHANGE HISTORY -------------- +08.04.11 BJH Release 10.35.42 + + pnmnorm: fix resolution of conflicting -wpercent and -wvalue. + 08.03.28 BJH Release 10.35.41 pnmnorm: fix -colorvalue, -saturation, -keephues options. diff --git a/editor/pnmnorm.c b/editor/pnmnorm.c index 91c4b03a..b36ad462 100644 --- a/editor/pnmnorm.c +++ b/editor/pnmnorm.c @@ -402,7 +402,7 @@ computeEndValues(FILE * const ifp, computeTopPercentile(hist, maxval, cols*rows, cmdline.wpercent, &percentWvalue); if (cmdline.wvalueSpec) - unlimitedWvalue = MIN(percentWvalue, cmdline.wvalue); + unlimitedWvalue = MAX(percentWvalue, cmdline.wvalue); else unlimitedWvalue = percentWvalue; } |