opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-17 15:26:00 +08:00
Code Issues Releases Wiki Activity

Fix clang 14 warnings

Browse Source
This commit is contained in:
Maksim Shabunin
2023-02-06 23:16:18 +03:00
parent 04d849259d
commit c56efb910e
23 changed files with 4 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/optflow/src/motempl.cpp
View File

@@ -157,8 +157,6 @@ void calcMotionGradient( InputArray _mhi, OutputArray _mask,
double delta1, double delta2,
int aperture_size )
{
static int runcase = 0; runcase++;
Mat mhi = _mhi.getMat();
Size size = mhi.size();

26
modules/optflow/src/rlof/berlof_invoker.hpp
View File

@@ -189,9 +189,6 @@ public:
int buffIdx = 0;
cv::Mat GMc0, GMc1, GMc2, GMc3;
cv::Vec2f Mc0, Mc1, Mc2, Mc3;
int noIteration = 0;
int noReusedIteration = 0;
int noSolvedIteration = 0;
for( j = 0; j < criteria.maxCount; j++ )
{
cv::Point2f delta(0,0);
@@ -536,7 +533,6 @@ public:
{
nextPts[ptidx] = backUpNextPt;
}
noIteration++;
break;
}
@@ -612,13 +608,10 @@ public:
delta.y = inextPt.y + b - nextPt.y;
} // isIn1 != isIn2
}
if( hasSolved == false)
noIteration++;
}
else
{
hasSolved = false;
noReusedIteration++;
}
if( hasSolved == false )
{
@@ -635,7 +628,6 @@ public:
{
nextPt += delta;
nextPts[ptidx] = nextPt - halfWin;
noSolvedIteration++;
break;
}
@@ -832,9 +824,6 @@ public:
int buffIdx = 0;
cv::Mat GMc0, GMc1, GMc2, GMc3;
cv::Vec4f Mc0, Mc1, Mc2, Mc3;
int noIteration = 0;
int noReusedIteration = 0;
int noSolvedIteration = 0;
for( j = 0; j < criteria.maxCount; j++ )
{
cv::Point2f delta(0,0);
@@ -859,7 +848,6 @@ public:
nextPts[ptidx] = backUpNextPt;
gainVecs[ptidx] = backUpGain;
}
noIteration++;
break;
}
@@ -1287,7 +1275,6 @@ public:
nextPts[ptidx] = backUpNextPt;
gainVecs[ptidx] = backUpGain;
}
noIteration++;
break;
}
@@ -1399,13 +1386,10 @@ public:
} // isIn1 != isIn2
}
if( hasSolved == false)
noIteration++;
}
else
{
hasSolved = false;
noReusedIteration++;
}
if( hasSolved == false )
{
@@ -1430,7 +1414,6 @@ public:
nextPt += delta;
nextPts[ptidx] = nextPt - halfWin;
gainVecs[ptidx]= gainVec + deltaGain;
noSolvedIteration++;
break;
}
@@ -1998,9 +1981,6 @@ namespace radial {
int j;
cv::Mat GMc0, GMc1, GMc2, GMc3;
cv::Vec4f Mc0, Mc1, Mc2, Mc3;
int noIteration = 0;
int noReusedIteration = 0;
int noSolvedIteration = 0;
for (j = 0; j < criteria.maxCount; j++)
{
cv::Point2f delta(0, 0);
@@ -2025,7 +2005,6 @@ namespace radial {
nextPts[ptidx] = backUpNextPt;
gainVecs[ptidx] = backUpGain;
}
noIteration++;
break;
}
@@ -2291,7 +2270,6 @@ namespace radial {
nextPts[ptidx] = backUpNextPt;
gainVecs[ptidx] = backUpGain;
}
noIteration++;
break;
}
@@ -2403,13 +2381,10 @@ namespace radial {
} // isIn1 != isIn2
}
if (hasSolved == false)
noIteration++;
}
else
{
hasSolved = false;
noReusedIteration++;
}
if (hasSolved == false)
{
@@ -2434,7 +2409,6 @@ namespace radial {
nextPt += delta;
nextPts[ptidx] = nextPt - halfWin;
gainVecs[ptidx] = gainVec + deltaGain;
noSolvedIteration++;
break;
}

3
modules/optflow/src/rlof/geo_interpolation.cpp
View File

@@ -297,15 +297,12 @@ Mat interpolate_irregular_knn(
}
}
int global_time = 0;
bool done = false;
while (!done) {
if (my_agents.size() == 0) {
done = true;
break;
}
global_time++;
std::multimap<float, Vec2i >::iterator current_it = my_agents.begin();
std::pair<float, Vec2i > current_p = *current_it;