mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed shadow error and added ocv_disable_module

Browse Source
This commit is contained in:
Anatoly Baksheev 2013-11-26 13:29:50 +04:00
parent 0e88733b13
commit 546c084fe6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/core/include/opencv2/core/affine.hpp
View File

@ -161,9 +161,9 @@ cv::Affine3<T>::Affine3(const Mat3& R, const Vec3& t)
}
template<typename T> inline
cv::Affine3<T>::Affine3(const Vec3& rvec, const Vec3& t)
cv::Affine3<T>::Affine3(const Vec3& _rvec, const Vec3& t)
{
rotation(rvec);
rotation(_rvec);
translation(t);
matrix.val[12] = matrix.val[13] = matrix.val[14] = 0;
matrix.val[15] = 1;
@ -208,9 +208,9 @@ void cv::Affine3<T>::rotation(const Mat3& R)
}
template<typename T> inline
void cv::Affine3<T>::rotation(const Vec3& rvec)
void cv::Affine3<T>::rotation(const Vec3& _rvec)
{
double rx = rvec[0], ry = rvec[1], rz = rvec[2];
double rx = _rvec[0], ry = _rvec[1], rz = _rvec[2];
double theta = std::sqrt(rx*rx + ry*ry + rz*rz);
if (theta < DBL_EPSILON)
@ -253,9 +253,9 @@ void cv::Affine3<T>::rotation(const cv::Mat& data)
}
else if ((data.cols == 3 && data.rows == 1) || (data.cols == 1 && data.rows == 3))
{
Vec3 rvec;
data.reshape(1, 3).copyTo(rvec);
rotation(rvec);
Vec3 _rvec;
data.reshape(1, 3).copyTo(_rvec);
rotation(_rvec);
}
else
CV_Assert(!"Input marix can be 3x3, 1x3 or 3x1");

2
modules/viz/CMakeLists.txt
View File

@ -1,5 +1,5 @@
if(NOT WITH_VTK OR NOT DEFINED HAVE_VTK OR NOT HAVE_VTK)
return()
ocv_module_disable()
endif()
include(${VTK_USE_FILE})