diff --git a/modules/calib3d/src/fisheye.cpp b/modules/calib3d/src/fisheye.cpp index b0e92a3adc..a11bea0ceb 100644 --- a/modules/calib3d/src/fisheye.cpp +++ b/modules/calib3d/src/fisheye.cpp @@ -872,8 +872,8 @@ double cv::fisheye::stereoCalibrate(InputArrayOfArrays objectPoints, InputArrayO if ((flags & CALIB_FIX_INTRINSIC)) { - internal::CalibrateExtrinsics(objectPoints, imagePoints1, intrinsicLeft, check_cond, thresh_cond, rvecs1, tvecs1); - internal::CalibrateExtrinsics(objectPoints, imagePoints2, intrinsicRight, check_cond, thresh_cond, rvecs2, tvecs2); + cv::internal::CalibrateExtrinsics(objectPoints, imagePoints1, intrinsicLeft, check_cond, thresh_cond, rvecs1, tvecs1); + cv::internal::CalibrateExtrinsics(objectPoints, imagePoints2, intrinsicRight, check_cond, thresh_cond, rvecs2, tvecs2); } intrinsicLeft.isEstimate[0] = flags & CALIB_FIX_INTRINSIC ? 0 : 1; @@ -918,8 +918,8 @@ double cv::fisheye::stereoCalibrate(InputArrayOfArrays objectPoints, InputArrayO om_ref.reshape(3, 1).copyTo(om_list.col(image_idx)); T_ref.reshape(3, 1).copyTo(T_list.col(image_idx)); } - cv::Vec3d omcur = internal::median3d(om_list); - cv::Vec3d Tcur = internal::median3d(T_list); + cv::Vec3d omcur = cv::internal::median3d(om_list); + cv::Vec3d Tcur = cv::internal::median3d(T_list); cv::Mat J = cv::Mat::zeros(4 * n_points * n_images, 18 + 6 * (n_images + 1), CV_64FC1), e = cv::Mat::zeros(4 * n_points * n_images, 1, CV_64FC1), Jkk, ekk; @@ -961,7 +961,7 @@ double cv::fisheye::stereoCalibrate(InputArrayOfArrays objectPoints, InputArrayO jacobians.col(14).copyTo(Jkk.col(4).rowRange(0, 2 * n_points)); //right camera jacobian - internal::compose_motion(rvec, tvec, omcur, Tcur, omr, Tr, domrdomckk, domrdTckk, domrdom, domrdT, dTrdomckk, dTrdTckk, dTrdom, dTrdT); + cv::internal::compose_motion(rvec, tvec, omcur, Tcur, omr, Tr, domrdomckk, domrdTckk, domrdom, domrdT, dTrdomckk, dTrdTckk, dTrdom, dTrdT); rvec = cv::Mat(rvecs2[image_idx]); tvec = cv::Mat(tvecs2[image_idx]); diff --git a/modules/core/include/opencv2/core/matx.hpp b/modules/core/include/opencv2/core/matx.hpp index 5f94cccccf..6cc5d06251 100644 --- a/modules/core/include/opencv2/core/matx.hpp +++ b/modules/core/include/opencv2/core/matx.hpp @@ -817,7 +817,7 @@ Vec<_Tp, n> Matx<_Tp, m, n>::solve(const Vec<_Tp, m>& rhs, int method) const template static inline double determinant(const Matx<_Tp, m, m>& a) { - return internal::Matx_DetOp<_Tp, m>()(a); + return cv::internal::Matx_DetOp<_Tp, m>()(a); } template static inline @@ -960,25 +960,25 @@ Vec<_Tp, cn> Vec<_Tp, cn>::mul(const Vec<_Tp, cn>& v) const template<> inline Vec Vec::conj() const { - return internal::conjugate(*this); + return cv::internal::conjugate(*this); } template<> inline Vec Vec::conj() const { - return internal::conjugate(*this); + return cv::internal::conjugate(*this); } template<> inline Vec Vec::conj() const { - return internal::conjugate(*this); + return cv::internal::conjugate(*this); } template<> inline Vec Vec::conj() const { - return internal::conjugate(*this); + return cv::internal::conjugate(*this); } template inline diff --git a/modules/core/include/opencv2/core/operations.hpp b/modules/core/include/opencv2/core/operations.hpp index c59919321f..dd9fe1e7bd 100644 --- a/modules/core/include/opencv2/core/operations.hpp +++ b/modules/core/include/opencv2/core/operations.hpp @@ -193,7 +193,7 @@ Matx<_Tp, n, m> Matx<_Tp, m, n>::inv(int method, bool *p_is_ok /*= NULL*/) const Matx<_Tp, n, m> b; bool ok; if( method == DECOMP_LU || method == DECOMP_CHOLESKY ) - ok = internal::Matx_FastInvOp<_Tp, m>()(*this, b, method); + ok = cv::internal::Matx_FastInvOp<_Tp, m>()(*this, b, method); else { Mat A(*this, false), B(b, false); @@ -209,7 +209,7 @@ Matx<_Tp, n, l> Matx<_Tp, m, n>::solve(const Matx<_Tp, m, l>& rhs, int method) c Matx<_Tp, n, l> x; bool ok; if( method == DECOMP_LU || method == DECOMP_CHOLESKY ) - ok = internal::Matx_FastSolveOp<_Tp, m, l>()(*this, rhs, x, method); + ok = cv::internal::Matx_FastSolveOp<_Tp, m, l>()(*this, rhs, x, method); else { Mat A(*this, false), B(rhs, false), X(x, false); diff --git a/modules/core/include/opencv2/core/persistence.hpp b/modules/core/include/opencv2/core/persistence.hpp index cc98e86c5d..fd691cc6cc 100644 --- a/modules/core/include/opencv2/core/persistence.hpp +++ b/modules/core/include/opencv2/core/persistence.hpp @@ -914,7 +914,7 @@ void write(FileStorage& fs, const Range& r ) template static inline void write( FileStorage& fs, const std::vector<_Tp>& vec ) { - internal::VecWriterProxy<_Tp, DataType<_Tp>::fmt != 0> w(&fs); + cv::internal::VecWriterProxy<_Tp, DataType<_Tp>::fmt != 0> w(&fs); w(vec); } @@ -922,63 +922,63 @@ void write( FileStorage& fs, const std::vector<_Tp>& vec ) template static inline void write(FileStorage& fs, const String& name, const Point_<_Tp>& pt ) { - internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); + cv::internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); write(fs, pt); } template static inline void write(FileStorage& fs, const String& name, const Point3_<_Tp>& pt ) { - internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); + cv::internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); write(fs, pt); } template static inline void write(FileStorage& fs, const String& name, const Size_<_Tp>& sz ) { - internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); + cv::internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); write(fs, sz); } template static inline void write(FileStorage& fs, const String& name, const Complex<_Tp>& c ) { - internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); + cv::internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); write(fs, c); } template static inline void write(FileStorage& fs, const String& name, const Rect_<_Tp>& r ) { - internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); + cv::internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); write(fs, r); } template static inline void write(FileStorage& fs, const String& name, const Vec<_Tp, cn>& v ) { - internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); + cv::internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); write(fs, v); } template static inline void write(FileStorage& fs, const String& name, const Scalar_<_Tp>& s ) { - internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); + cv::internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); write(fs, s); } static inline void write(FileStorage& fs, const String& name, const Range& r ) { - internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); + cv::internal::WriteStructContext ws(fs, name, FileNode::SEQ+FileNode::FLOW); write(fs, r); } template static inline void write( FileStorage& fs, const String& name, const std::vector<_Tp>& vec ) { - internal::WriteStructContext ws(fs, name, FileNode::SEQ+(DataType<_Tp>::fmt != 0 ? FileNode::FLOW : 0)); + cv::internal::WriteStructContext ws(fs, name, FileNode::SEQ+(DataType<_Tp>::fmt != 0 ? FileNode::FLOW : 0)); write(fs, vec); } @@ -1030,7 +1030,7 @@ void read(const FileNode& node, short& value, short default_value) template static inline void read( FileNodeIterator& it, std::vector<_Tp>& vec, size_t maxCount = (size_t)INT_MAX ) { - internal::VecReaderProxy<_Tp, DataType<_Tp>::fmt != 0> r(&it); + cv::internal::VecReaderProxy<_Tp, DataType<_Tp>::fmt != 0> r(&it); r(vec, maxCount); } @@ -1101,7 +1101,7 @@ FileNodeIterator& operator >> (FileNodeIterator& it, _Tp& value) template static inline FileNodeIterator& operator >> (FileNodeIterator& it, std::vector<_Tp>& vec) { - internal::VecReaderProxy<_Tp, DataType<_Tp>::fmt != 0> r(&it); + cv::internal::VecReaderProxy<_Tp, DataType<_Tp>::fmt != 0> r(&it); r(vec, (size_t)INT_MAX); return it; } diff --git a/modules/core/src/algorithm.cpp b/modules/core/src/algorithm.cpp index 9f9493e8a0..f817a987b4 100644 --- a/modules/core/src/algorithm.cpp +++ b/modules/core/src/algorithm.cpp @@ -423,7 +423,7 @@ void AlgorithmInfo::write(const Algorithm* algo, FileStorage& fs) const cv::write(fs, pname, algo->get >(pname)); else if( p.type == Param::ALGORITHM ) { - internal::WriteStructContext ws(fs, pname, CV_NODE_MAP); + cv::internal::WriteStructContext ws(fs, pname, CV_NODE_MAP); Ptr nestedAlgo = algo->get(pname); nestedAlgo->write(fs); } diff --git a/modules/core/src/persistence.cpp b/modules/core/src/persistence.cpp index fb5648d06f..5e14e81aa8 100644 --- a/modules/core/src/persistence.cpp +++ b/modules/core/src/persistence.cpp @@ -5548,7 +5548,7 @@ void read( const FileNode& node, SparseMat& mat, const SparseMat& default_mat ) void write(FileStorage& fs, const String& objname, const std::vector& keypoints) { - internal::WriteStructContext ws(fs, objname, CV_NODE_SEQ + CV_NODE_FLOW); + cv::internal::WriteStructContext ws(fs, objname, CV_NODE_SEQ + CV_NODE_FLOW); int i, npoints = (int)keypoints.size(); for( i = 0; i < npoints; i++ ) diff --git a/modules/cudaarithm/src/reductions.cpp b/modules/cudaarithm/src/reductions.cpp index 8d0add4537..04d1ac5de0 100644 --- a/modules/cudaarithm/src/reductions.cpp +++ b/modules/cudaarithm/src/reductions.cpp @@ -106,11 +106,11 @@ void cv::cuda::calcNorm(InputArray _src, OutputArray dst, int normType, InputArr } else if (normType == NORM_L2) { - internal::normL2(src_single_channel, dst, mask, stream); + cv::cuda::internal::normL2(src_single_channel, dst, mask, stream); } else // NORM_INF { - internal::findMaxAbs(src_single_channel, dst, mask, stream); + cv::cuda::internal::findMaxAbs(src_single_channel, dst, mask, stream); } }