diff options
author | bfriesen <bfriesen> | 2015-05-28 01:50:20 +0000 |
---|---|---|
committer | bfriesen <bfriesen> | 2015-05-28 01:50:20 +0000 |
commit | 836d3b836804d9a5c6a0e9c0e211a2e2cb65ebd3 (patch) | |
tree | 2bc74c991d4acb2796192438faf9d775733db005 /tools | |
parent | 8a4c24600ef3fafcf6e13f18e8ceedc070d048bc (diff) | |
download | libtiff-836d3b836804d9a5c6a0e9c0e211a2e2cb65ebd3.tar.gz |
* tools/tiffcrop.c (ROTATE_ANY): Fix Coverity 1294542 "Logical
vs. bitwise operator".
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile.in | 1 | ||||
-rw-r--r-- | tools/tiffcrop.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index 8be3c664..d49a9987 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -368,7 +368,6 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c index 1d6b5618..17634af0 100644 --- a/tools/tiffcrop.c +++ b/tools/tiffcrop.c @@ -1,4 +1,4 @@ -/* $Id: tiffcrop.c,v 1.25 2014-12-26 16:32:32 bfriesen Exp $ */ +/* $Id: tiffcrop.c,v 1.26 2015-05-28 01:50:23 bfriesen Exp $ */ /* tiffcrop.c -- a port of tiffcp.c extended to include manipulations of * the image data through additional options listed below @@ -178,7 +178,7 @@ extern int getopt(int, char**, char*); #define ROTATECW_90 8 #define ROTATECW_180 16 #define ROTATECW_270 32 -#define ROTATE_ANY ROTATECW_90 || ROTATECW_180 || ROTATECW_270 +#define ROTATE_ANY (ROTATECW_90 | ROTATECW_180 | ROTATECW_270) #define CROP_NONE 0 #define CROP_MARGINS 1 |