diff options
-rw-r--r-- | analyzer/pamsumm.c | 4 | ||||
-rw-r--r-- | doc/HISTORY | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/analyzer/pamsumm.c b/analyzer/pamsumm.c index 9b74e789..03ff6749 100644 --- a/analyzer/pamsumm.c +++ b/analyzer/pamsumm.c @@ -58,8 +58,8 @@ parseCommandLine(int argc, const char ** const argv, pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others. */ - if (sumSpec + minSpec + maxSpec > 1) - pm_error("You may specify at most one of -sum, -min, and -max"); + if (sumSpec + minSpec + maxSpec + meanSpec > 1) + pm_error("You may specify at most one of -sum, -min, -max, and -mean"); if (sumSpec) { cmdlineP->function = FN_ADD; diff --git a/doc/HISTORY b/doc/HISTORY index f34841ac..b56ad0ac 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -38,6 +38,9 @@ not yet BJH Release 10.88.00 allocation fails. Always broken (programs were added to Netpbm in Release 9.0 (April 2000). + pamsumm: Fix bug: with -mean and a conflicting option such as + -sum, the program ignores one of the options. It should fail. + Build: fix for Cygwin, "no rule to make pm_config.h". 19.06.28 BJH Release 10.87.00 |