mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15573 from alalek:build_cxx11_warnings

Browse Source
This commit is contained in:
Alexander Alekhin 2019-09-24 22:08:55 +00:00
commit d2cacac07a
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/include/opencv2/core/cvdef.h
View File

@ -588,6 +588,13 @@ Cv64suf;
# endif
#endif
#ifdef CV_CXX_MOVE_SEMANTICS
#define CV_CXX_MOVE(x) std::move(x)
#else
#define CV_CXX_MOVE(x) (x)
#endif
/****************************************************************************************\
* C++11 std::array *
\****************************************************************************************/

2
modules/stitching/src/camera.cpp
View File

@ -66,7 +66,7 @@ Mat CameraParams::K() const
Mat_<double> k = Mat::eye(3, 3, CV_64F);
k(0,0) = focal; k(0,2) = ppx;
k(1,1) = focal * aspect; k(1,2) = ppy;
return k;
return CV_CXX_MOVE(k);
}
} // namespace detail

16
modules/videostab/src/global_motion.cpp
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);
}