1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00

backport: fixed warnings produced by clang-9.0.0

ea3dc78986
https://github.com/opencv/opencv_contrib/commit/83fc27cb99db4435d07974090fbdc77d831931cd
This commit is contained in:
Maksim Shabunin
2019-01-28 14:48:00 +03:00
committed by Alexander Alekhin
parent c4d2e3c0b3
commit c8abf2ad14
3 changed files with 16 additions and 9 deletions
+8 -8
View File
@@ -113,7 +113,7 @@ static Mat normalizePoints(int npoints, Point2f *points)
T(0,0) = T(1,1) = s;
T(0,2) = -cx*s;
T(1,2) = -cy*s;
return T;
return CV_CXX_MOVE(T);
}
@@ -138,7 +138,7 @@ static Mat estimateGlobMotionLeastSquaresTranslation(
*rmse = std::sqrt(*rmse / npoints);
}
return M;
return CV_CXX_MOVE(M);
}
@@ -219,7 +219,7 @@ static Mat estimateGlobMotionLeastSquaresRotation(
*rmse = std::sqrt(*rmse / npoints);
}
return M;
return CV_CXX_MOVE(M);
}
static Mat estimateGlobMotionLeastSquaresRigid(
@@ -273,7 +273,7 @@ static Mat estimateGlobMotionLeastSquaresRigid(
*rmse = std::sqrt(*rmse / npoints);
}
return M;
return CV_CXX_MOVE(M);
}
@@ -484,7 +484,7 @@ Mat estimateGlobalMotionRansac(
if (ninliers)
*ninliers = ninliersMax;
return bestM;
return CV_CXX_MOVE(bestM);
}
@@ -527,7 +527,7 @@ Mat MotionEstimatorRansacL2::estimate(InputArray points0, InputArray points1, bo
if (ok) *ok = false;
}
return M;
return CV_CXX_MOVE(M);
}
@@ -681,7 +681,7 @@ Mat FromFileMotionReader::estimate(const Mat &/*frame0*/, const Mat &/*frame1*/,
>> M(1,0) >> M(1,1) >> M(1,2)
>> M(2,0) >> M(2,1) >> M(2,2) >> ok_;
if (ok) *ok = ok_;
return M;
return CV_CXX_MOVE(M);
}
@@ -701,7 +701,7 @@ Mat ToFileMotionWriter::estimate(const Mat &frame0, const Mat &frame1, bool *ok)
<< M(1,0) << " " << M(1,1) << " " << M(1,2) << " "
<< M(2,0) << " " << M(2,1) << " " << M(2,2) << " " << ok_ << std::endl;
if (ok) *ok = ok_;
return M;
return CV_CXX_MOVE(M);
}