mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 15:53:03 +04:00
ts: refactor OpenCV tests
- removed tr1 usage (dropped in C++17) - moved includes of vector/map/iostream/limits into ts.hpp - require opencv_test + anonymous namespace (added compile check) - fixed norm() usage (must be from cvtest::norm for checks) and other conflict functions - added missing license headers
This commit is contained in:
@@ -41,8 +41,7 @@
|
||||
|
||||
#include "test_precomp.hpp"
|
||||
|
||||
using namespace cv;
|
||||
using namespace std;
|
||||
namespace opencv_test { namespace {
|
||||
|
||||
/*static int
|
||||
cvTsPointConvexPolygon( CvPoint2D32f pt, CvPoint2D32f* v, int n )
|
||||
@@ -1058,7 +1057,7 @@ void CV_MinCircleTest2::run_func()
|
||||
Point2f calcCenter;
|
||||
float calcRadius;
|
||||
minEnclosingCircle(pts, calcCenter, calcRadius);
|
||||
delta = (float)norm(calcCenter - center) + abs(calcRadius - radius);
|
||||
delta = (float)cv::norm(calcCenter - center) + abs(calcRadius - radius);
|
||||
}
|
||||
|
||||
int CV_MinCircleTest2::validate_test_results( int test_case_idx )
|
||||
@@ -2027,4 +2026,5 @@ INSTANTIATE_TEST_CASE_P(Imgproc, ConvexityDefects_regression_5908,
|
||||
testing::Values(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
|
||||
));
|
||||
|
||||
}} // namespace
|
||||
/* End of file. */
|
||||
|
||||
Reference in New Issue
Block a user