build: eliminate warnings

alalek · alalek · commit 116c8d0ddf4c · 2018-01-05T04:30:08.000Z
warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
diff --git a/modules/imgproc/src/thresh.cpp b/modules/imgproc/src/thresh.cpp
@@ -1483,14 +1483,14 @@ double cv::threshold( InputArray _src, OutputArray _dst, double thresh, double m
         imaxval = saturate_cast<ushort>(imaxval);
 
         int ushrt_min = 0;
-        if (ithresh < ushrt_min || ithresh >= USHRT_MAX)
+        if (ithresh < ushrt_min || ithresh >= (int)USHRT_MAX)
         {
             if (type == THRESH_BINARY || type == THRESH_BINARY_INV ||
                ((type == THRESH_TRUNC || type == THRESH_TOZERO_INV) && ithresh < ushrt_min) ||
-               (type == THRESH_TOZERO && ithresh >= USHRT_MAX))
+               (type == THRESH_TOZERO && ithresh >= (int)USHRT_MAX))
             {
-                int v = type == THRESH_BINARY ? (ithresh >= USHRT_MAX ? 0 : imaxval) :
-                        type == THRESH_BINARY_INV ? (ithresh >= USHRT_MAX ? imaxval : 0) :
+                int v = type == THRESH_BINARY ? (ithresh >= (int)USHRT_MAX ? 0 : imaxval) :
+                        type == THRESH_BINARY_INV ? (ithresh >= (int)USHRT_MAX ? imaxval : 0) :
                   /*type == THRESH_TRUNC ? imaxval :*/ 0;
                 dst.setTo(v);
             }

Original file line number	Diff line number	Diff line change
`@@ -1483,14 +1483,14 @@ double cv::threshold( InputArray _src, OutputArray _dst, double thresh, double m`
`1483`	`1483`	`imaxval = saturate_cast<ushort>(imaxval);`
`1484`	`1484`
`1485`	`1485`	`int ushrt_min = 0;`
`1486`		`- if (ithresh < ushrt_min \|\| ithresh >= USHRT_MAX)`
	`1486`	`+ if (ithresh < ushrt_min \|\| ithresh >= (int)USHRT_MAX)`
`1487`	`1487`	`{`
`1488`	`1488`	`if (type == THRESH_BINARY \|\| type == THRESH_BINARY_INV \|\|`
`1489`	`1489`	`((type == THRESH_TRUNC \|\| type == THRESH_TOZERO_INV) && ithresh < ushrt_min) \|\|`
`1490`		`- (type == THRESH_TOZERO && ithresh >= USHRT_MAX))`
	`1490`	`+ (type == THRESH_TOZERO && ithresh >= (int)USHRT_MAX))`
`1491`	`1491`	`{`
`1492`		`- int v = type == THRESH_BINARY ? (ithresh >= USHRT_MAX ? 0 : imaxval) :`
`1493`		`- type == THRESH_BINARY_INV ? (ithresh >= USHRT_MAX ? imaxval : 0) :`
	`1492`	`+ int v = type == THRESH_BINARY ? (ithresh >= (int)USHRT_MAX ? 0 : imaxval) :`
	`1493`	`+ type == THRESH_BINARY_INV ? (ithresh >= (int)USHRT_MAX ? imaxval : 0) :`
`1494`	`1494`	`/type == THRESH_TRUNC ? imaxval :/ 0;`
`1495`	`1495`	`dst.setTo(v);`
`1496`	`1496`	`}`