1*4882a593SmuzhiyunFrom bad48e90b410df32172006c7876da449ba62cdba Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Su_Laus <sulau@freenet.de> 3*4882a593SmuzhiyunDate: Sat, 20 Aug 2022 23:35:26 +0200 4*4882a593SmuzhiyunSubject: [PATCH] tiffcrop -S option: Make decision simpler. 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUpstream-Status: Backport 7*4882a593SmuzhiyunSigned-off-by: Ross Burton <ross.burton@arm.com> 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun tools/tiffcrop.c | 10 +++++----- 11*4882a593Smuzhiyun 1 file changed, 5 insertions(+), 5 deletions(-) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff --git a/tools/tiffcrop.c b/tools/tiffcrop.c 14*4882a593Smuzhiyunindex c3b758ec..8fd856dc 100644 15*4882a593Smuzhiyun--- a/tools/tiffcrop.c 16*4882a593Smuzhiyun+++ b/tools/tiffcrop.c 17*4882a593Smuzhiyun@@ -2133,11 +2133,11 @@ void process_command_opts (int argc, char *argv[], char *mp, char *mode, uint32 18*4882a593Smuzhiyun } 19*4882a593Smuzhiyun /*-- Check for not allowed combinations (e.g. -X, -Y and -Z, -z and -S are mutually exclusive) --*/ 20*4882a593Smuzhiyun char XY, Z, R, S; 21*4882a593Smuzhiyun- XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH)); 22*4882a593Smuzhiyun- Z = (crop_data->crop_mode & CROP_ZONES); 23*4882a593Smuzhiyun- R = (crop_data->crop_mode & CROP_REGIONS); 24*4882a593Smuzhiyun- S = (page->mode & PAGE_MODE_ROWSCOLS); 25*4882a593Smuzhiyun- if ((XY && Z) || (XY && R) || (XY && S) || (Z && R) || (Z && S) || (R && S)) { 26*4882a593Smuzhiyun+ XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH)) ? 1 : 0; 27*4882a593Smuzhiyun+ Z = (crop_data->crop_mode & CROP_ZONES) ? 1 : 0; 28*4882a593Smuzhiyun+ R = (crop_data->crop_mode & CROP_REGIONS) ? 1 : 0; 29*4882a593Smuzhiyun+ S = (page->mode & PAGE_MODE_ROWSCOLS) ? 1 : 0; 30*4882a593Smuzhiyun+ if (XY + Z + R + S > 1) { 31*4882a593Smuzhiyun TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z, -z and -S are mutually exclusive.->Exit"); 32*4882a593Smuzhiyun exit(EXIT_FAILURE); 33*4882a593Smuzhiyun } 34*4882a593Smuzhiyun-- 35*4882a593Smuzhiyun2.34.1 36*4882a593Smuzhiyun 37