diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2020-03-12 02:10:25 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2020-03-12 02:10:25 +0000 |
commit | b385637b4b66e511db8262915a247069852e47a5 (patch) | |
tree | bae2395b1c35832948de774f51bd29db5ec2455d | |
parent | cae41e3814616cef168509b417ad6c1f38c2c7a2 (diff) | |
download | netpbm-mirror-b385637b4b66e511db8262915a247069852e47a5.tar.gz netpbm-mirror-b385637b4b66e511db8262915a247069852e47a5.tar.xz netpbm-mirror-b385637b4b66e511db8262915a247069852e47a5.zip |
Fix bug: -hilbert not included in check for conflicting options
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3743 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-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 { |