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

fix for fisheye

Browse Source
This commit is contained in:
Ilya Lavrenov 2014-07-01 14:53:39 +04:00
parent 070be56e14
commit 43e4946cca
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/calib3d/test/test_fisheye.cpp
View File

@ -60,8 +60,6 @@ protected:
protected: protected:
std::string combine(const std::string& _item1, const std::string& _item2); std::string combine(const std::string& _item1, const std::string& _item2);
std::string combine_format(const std::string& item1, const std::string& item2, ...);
cv::Mat mergeRectification(const cv::Mat& l, const cv::Mat& r); cv::Mat mergeRectification(const cv::Mat& l, const cv::Mat& r);
}; };
@ -427,10 +425,10 @@ TEST_F(fisheyeTest, rectify)
cv::Mat rectification = mergeRectification(lundist, rundist); cv::Mat rectification = mergeRectification(lundist, rundist);
cv::Mat correct = cv::imread(combine_format(datasets_repository_path, "rectification_AB_%03d.png", i)); cv::Mat correct = cv::imread(combine(datasets_repository_path, cv::format("rectification_AB_%03d.png", i)));
if (correct.empty()) if (correct.empty())
cv::imwrite(combine_format(datasets_repository_path, "rectification_AB_%03d.png", i), rectification); cv::imwrite(combine(datasets_repository_path, cv::format("rectification_AB_%03d.png", i)), rectification);
else else
EXPECT_MAT_NEAR(correct, rectification, 1e-10); EXPECT_MAT_NEAR(correct, rectification, 1e-10);
} }
@ -599,17 +597,6 @@ std::string fisheyeTest::combine(const std::string& _item1, const std::string& _
return item1 + (last != '/' ? "/" : "") + item2; return item1 + (last != '/' ? "/" : "") + item2;
} }
std::string fisheyeTest::combine_format(const std::string& item1, const std::string& item2, ...)
{
std::string fmt = combine(item1, item2);
char buffer[1 << 16];
va_list args;
va_start( args, item2 );
vsprintf( buffer, fmt.c_str(), args );
va_end( args );
return std::string(buffer);
}
cv::Mat fisheyeTest::mergeRectification(const cv::Mat& l, const cv::Mat& r) cv::Mat fisheyeTest::mergeRectification(const cv::Mat& l, const cv::Mat& r)
{ {
CV_Assert(l.type() == r.type() && l.size() == r.size()); CV_Assert(l.type() == r.type() && l.size() == r.size());