| Upstream-Status: Backport |
| Signed-off-by: Ross Burton <ross.burton@arm.com> |
| |
| From bad48e90b410df32172006c7876da449ba62cdba Mon Sep 17 00:00:00 2001 |
| From: Su_Laus <sulau@freenet.de> |
| Date: Sat, 20 Aug 2022 23:35:26 +0200 |
| Subject: [PATCH] tiffcrop -S option: Make decision simpler. |
| |
| --- |
| tools/tiffcrop.c | 10 +++++----- |
| 1 file changed, 5 insertions(+), 5 deletions(-) |
| |
| diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c |
| index c3b758ec..8fd856dc 100644 |
| --- a/tools/tiffcrop.c |
| +++ b/tools/tiffcrop.c |
| @@ -2133,11 +2133,11 @@ void process_command_opts (int argc, char *argv[], char *mp, char *mode, uint32 |
| } |
| /*-- Check for not allowed combinations (e.g. -X, -Y and -Z, -z and -S are mutually exclusive) --*/ |
| char XY, Z, R, S; |
| - XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH)); |
| - Z = (crop_data->crop_mode & CROP_ZONES); |
| - R = (crop_data->crop_mode & CROP_REGIONS); |
| - S = (page->mode & PAGE_MODE_ROWSCOLS); |
| - if ((XY && Z) || (XY && R) || (XY && S) || (Z && R) || (Z && S) || (R && S)) { |
| + XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH)) ? 1 : 0; |
| + Z = (crop_data->crop_mode & CROP_ZONES) ? 1 : 0; |
| + R = (crop_data->crop_mode & CROP_REGIONS) ? 1 : 0; |
| + S = (page->mode & PAGE_MODE_ROWSCOLS) ? 1 : 0; |
| + if (XY + Z + R + S > 1) { |
| TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z, -z and -S are mutually exclusive.->Exit"); |
| exit(EXIT_FAILURE); |
| } |
| -- |
| 2.34.1 |
| |