about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--doc/HISTORY9
-rw-r--r--other/pamarith.c5
2 files changed, 3 insertions, 11 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index e014a7dc..c39c2a7c 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -8,8 +8,9 @@ not yet  BJH  Release 10.93.00
 
               pamarith: Add -equal.
 
-              pamarith: Fix bug: fails with more than two operands for
-              -multiply, -minimum, -maximum, -nand, and -nor.
+              pamarith: Allow more than two operands for functions for which
+              it makes sense (all but -subtract, -difference, -compare,
+              -divide, -shiftleft, and -shiftright).
 
 20.09.26 BJH  Release 10.92.00
 
@@ -2038,10 +2039,6 @@ not yet  BJH  Release 10.93.00
 
               Add ppmtoascii.  Thanks "Frank Ch. Eigler" <fche@elastic.org>.
 
-              pamarith: Allow more than two operands for functions for which
-              it makes sense (all but -subtract, -difference, -compare,
-              -divide, -shiftleft, and -shiftright).
-
               pnmtops: Add -bitsperpixel option.
 
               pamx: Make exit status 0 instead of 10 when window manager
diff --git a/other/pamarith.c b/other/pamarith.c
index d2544d6d..e0a105e7 100644
--- a/other/pamarith.c
+++ b/other/pamarith.c
@@ -911,11 +911,6 @@ main(int argc, const char *argv[]) {
 
     parseCommandLine(argc, argv, &cmdline);
 
-    if (cmdline.operandCt != 2)
-        /* Code for > 2 operands not written yet */
-        pm_error("You specified %u operands.  We understand only 2.",
-                 cmdline.operandCt);
-
     if1P = pm_openr(cmdline.operandFileNames[0]);
     if2P = pm_openr(cmdline.operandFileNames[1]);