diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2022-01-23 20:35:00 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2022-01-23 20:35:00 +0000 |
| commit | bb654cfb43290dc4171d989221c9906d4898518a (patch) | |
| tree | 5aa2f8f804454506a047048bd8d44aabdca01d6d /editor | |
| parent | 35ea5a8e31f41b88eb8c8ecdb8ab152961718500 (diff) | |
| download | netpbm-mirror-bb654cfb43290dc4171d989221c9906d4898518a.tar.gz netpbm-mirror-bb654cfb43290dc4171d989221c9906d4898518a.tar.xz netpbm-mirror-bb654cfb43290dc4171d989221c9906d4898518a.zip | |
Revert previous change - -halign once again invalid with both -left and -right
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4255 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/pnmpad.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/editor/pnmpad.c b/editor/pnmpad.c index 02dc32e7..9fa9f9e6 100644 --- a/editor/pnmpad.c +++ b/editor/pnmpad.c @@ -128,11 +128,10 @@ parseCommandLine(int argc, const char ** argv, if (cmdlineP->ysizeSpec > 1) pm_error("You can specify -height only once"); - if (xalignSpec && (cmdlineP->leftSpec || cmdlineP->rightSpec) - && !mwidthSpec) + if (xalignSpec && (cmdlineP->leftSpec || cmdlineP->rightSpec)) pm_error("You cannot specify both -halign and -left or -right"); - if (yalignSpec && (cmdlineP->topSpec || cmdlineP->bottomSpec) - && !mheightSpec) + + if (yalignSpec && (cmdlineP->topSpec || cmdlineP->bottomSpec)) pm_error("You cannot specify both -valign and -top or -bottom"); if (xalignSpec && (!cmdlineP->xsizeSpec && !mwidthSpec) ) |