generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/Itseez/opencv

Browse Source
This commit is contained in:
Alexandr Kondratev
2016-07-05 13:34:11 +03:00
parent 179998a8a2 22682f933a
commit f5b96eb828
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/calib3d/src/ptsetreg.cpp
View File

@@ -462,7 +462,7 @@ public:
double b = F[4]*f.x + F[5]*f.y + F[ 6]*f.z + F[ 7] - t.y; double b = F[4]*f.x + F[5]*f.y + F[ 6]*f.z + F[ 7] - t.y;
double c = F[8]*f.x + F[9]*f.y + F[10]*f.z + F[11] - t.z; double c = F[8]*f.x + F[9]*f.y + F[10]*f.z + F[11] - t.z;
errptr[i] = (float)std::sqrt(a*a + b*b + c*c); errptr[i] = (float)(a*a + b*b + c*c);
} }
} }

4
modules/core/test/test_math.cpp
View File

@@ -2384,7 +2384,7 @@ TEST(Core_SolvePoly, regression_5599)
double prec; double prec;
prec = cv::solvePoly(coefs, r); prec = cv::solvePoly(coefs, r);
EXPECT_LE(prec, 1e-6); EXPECT_LE(prec, 1e-6);
EXPECT_EQ(4, r.total()); EXPECT_EQ(4u, r.total());
//std::cout << "Preciseness = " << prec << std::endl; //std::cout << "Preciseness = " << prec << std::endl;
//std::cout << "roots:\n" << r << "\n" << std::endl; //std::cout << "roots:\n" << r << "\n" << std::endl;
ASSERT_EQ(CV_32FC2, r.type()); ASSERT_EQ(CV_32FC2, r.type());
@@ -2400,7 +2400,7 @@ TEST(Core_SolvePoly, regression_5599)
double prec; double prec;
prec = cv::solvePoly(coefs, r); prec = cv::solvePoly(coefs, r);
EXPECT_LE(prec, 1e-6); EXPECT_LE(prec, 1e-6);
EXPECT_EQ(2, r.total()); EXPECT_EQ(2u, r.total());
//std::cout << "Preciseness = " << prec << std::endl; //std::cout << "Preciseness = " << prec << std::endl;
//std::cout << "roots:\n" << r << "\n" << std::endl; //std::cout << "roots:\n" << r << "\n" << std::endl;
ASSERT_EQ(CV_32FC2, r.type()); ASSERT_EQ(CV_32FC2, r.type());

6
modules/core/test/test_utils.cpp
View File

@@ -223,13 +223,13 @@ TEST(CommandLineParser, positional_regression_5074_equal_sign)
TEST(AutoBuffer, allocate_test) TEST(AutoBuffer, allocate_test)
{ {
AutoBuffer<int, 5> abuf(2); AutoBuffer<int, 5> abuf(2);
EXPECT_EQ(2, abuf.size()); EXPECT_EQ(2u, abuf.size());
abuf.allocate(4); abuf.allocate(4);
EXPECT_EQ(4, abuf.size()); EXPECT_EQ(4u, abuf.size());
abuf.allocate(6); abuf.allocate(6);
EXPECT_EQ(6, abuf.size()); EXPECT_EQ(6u, abuf.size());
} }
} // namespace } // namespace

6
modules/imgproc/src/color.cpp
View File

@@ -8394,7 +8394,11 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
CV_OCL_RUN( _src.dims() <= 2 && _dst.isUMat() && !(depth == CV_8U && (code == CV_Luv2BGR || code == CV_Luv2RGB)), CV_OCL_RUN( _src.dims() <= 2 && _dst.isUMat() && !(depth == CV_8U && (code == CV_Luv2BGR || code == CV_Luv2RGB)),
ocl_cvtColor(_src, _dst, code, dcn) ) ocl_cvtColor(_src, _dst, code, dcn) )
Mat src = _src.getMat(), dst; Mat src, dst;
if (_src.getObj() == _dst.getObj()) // inplace processing (#6653)
_src.copyTo(src);
else
src = _src.getMat();
Size sz = src.size(); Size sz = src.size();
CV_Assert( depth == CV_8U || depth == CV_16U || depth == CV_32F ); CV_Assert( depth == CV_8U || depth == CV_16U || depth == CV_32F );