diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2019-04-10 23:30:43 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2019-04-10 23:30:43 +0000 |
| commit | 8cc3724b6a1d1c120aec6b83339d309830f907da (patch) | |
| tree | 42ab8ebca04668841cc88569497b52ed18fd5199 | |
| parent | 04be75d5e37d1604d41d4b1339b635e37dd2e5df (diff) | |
| download | netpbm-mirror-8cc3724b6a1d1c120aec6b83339d309830f907da.tar.gz netpbm-mirror-8cc3724b6a1d1c120aec6b83339d309830f907da.tar.xz netpbm-mirror-8cc3724b6a1d1c120aec6b83339d309830f907da.zip | |
Don't allow -borderfile with -reportXXX - it doesn't work
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3595 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | doc/HISTORY | 2 | ||||
| -rw-r--r-- | editor/pnmcrop.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index b4418713..7d9a20de 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -7,7 +7,7 @@ CHANGE HISTORY not yet BJH Release 10.87.00 pnmcrop: fix bug: -bgcolor doesn't work. Always present - (-bgcolor was introduced in Netpbm 10.86 (March 2019). + (-bgcolor was introduced in Netpbm 10.86 (March 2019)). 19.03.30 BJH Release 10.86.00 diff --git a/editor/pnmcrop.c b/editor/pnmcrop.c index ba8e9090..6ef1c280 100644 --- a/editor/pnmcrop.c +++ b/editor/pnmcrop.c @@ -162,6 +162,10 @@ parseCommandLine(int argc, const char ** argv, if (reportFullOpt && reportSizeOpt) pm_error("You cannot specify both -reportfull and -reportsize"); + if ((reportFullOpt || reportSizeOpt) && borderfileSpec) + pm_error("You cannot specify -reportfull or -reportsize " + "with -borderfile"); + if (reportFullOpt) cmdlineP->baseOperation = OP_REPORT_FULL; else if (reportSizeOpt) |