diff options
| -rw-r--r-- | doc/HISTORY | 4 | ||||
| -rw-r--r-- | editor/pamditherbw.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index e94457d4..68035b80 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -11,6 +11,10 @@ not yet BJH Release 10.90.00 pamundice: Add error and warning messages for insane file name pattern. + pamditherbw: Fix bug: issue error message instead of just + ignoring one of the options when you specify -hilbert and + another halftone option. + pamdice: Fix junk output when -width or -height not specified. pamdice: Fix crash when -width or -height is zero. diff --git a/editor/pamditherbw.c b/editor/pamditherbw.c index e3a121d4..6ec2511a 100644 --- a/editor/pamditherbw.c +++ b/editor/pamditherbw.c @@ -104,7 +104,7 @@ parseCommandLine(int argc, char ** argv, if (floydOpt + atkinsonOpt + thresholdOpt + hilbertOpt + dither8Opt + cluster3Opt + cluster4Opt + cluster8Opt == 0) cmdlineP->halftone = QT_FS; - else if (floydOpt + atkinsonOpt + thresholdOpt + dither8Opt + + else if (floydOpt + atkinsonOpt + thresholdOpt + hilbertOpt + dither8Opt + cluster3Opt + cluster4Opt + cluster8Opt > 1) pm_error("Cannot specify more than one halftoning type"); else { |