mirror of
https://github.com/opencv/opencv.git
synced 2025-08-01 02:18:01 +08:00
Merge pull request #8877 from alalek:fix_integer_overflow
This commit is contained in:
commit
daf3fabe0d
@ -52,8 +52,8 @@ static bool ocl_calcAlmostDist2Weight(UMat & almostDist2Weight,
|
|||||||
FT almostDist2ActualDistMultiplier = (FT)(1 << almostTemplateWindowSizeSqBinShift) / templateWindowSizeSq;
|
FT almostDist2ActualDistMultiplier = (FT)(1 << almostTemplateWindowSizeSqBinShift) / templateWindowSizeSq;
|
||||||
|
|
||||||
const FT WEIGHT_THRESHOLD = 1e-3f;
|
const FT WEIGHT_THRESHOLD = 1e-3f;
|
||||||
int maxDist = normType == NORM_L1 ? std::numeric_limits<ST>::max() * cn :
|
WT maxDist = normType == NORM_L1 ? (WT)std::numeric_limits<ST>::max() * cn :
|
||||||
std::numeric_limits<ST>::max() * std::numeric_limits<ST>::max() * cn;
|
(WT)std::numeric_limits<ST>::max() * (WT)std::numeric_limits<ST>::max() * cn;
|
||||||
int almostMaxDist = (int)(maxDist / almostDist2ActualDistMultiplier + 1);
|
int almostMaxDist = (int)(maxDist / almostDist2ActualDistMultiplier + 1);
|
||||||
FT den[4];
|
FT den[4];
|
||||||
CV_Assert(hn > 0 && hn <= 4);
|
CV_Assert(hn > 0 && hn <= 4);
|
||||||
|
Loading…
Reference in New Issue
Block a user