mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 08:13:04 +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,10 +41,16 @@
|
||||
//M*/
|
||||
|
||||
#include "test_precomp.hpp"
|
||||
#include "cvconfig.h"
|
||||
#include "../src/input_array_utility.hpp"
|
||||
#include "opencv2/ts/ocl_test.hpp"
|
||||
|
||||
namespace opencv_test {
|
||||
|
||||
#ifdef HAVE_VIDEO_INPUT
|
||||
|
||||
namespace {
|
||||
|
||||
class AllignedFrameSource : public cv::superres::FrameSource
|
||||
{
|
||||
public:
|
||||
@@ -281,9 +287,10 @@ TEST_F(SuperResolution, BTVL1_CUDA)
|
||||
|
||||
#endif
|
||||
|
||||
} // namespace
|
||||
|
||||
#ifdef HAVE_OPENCL
|
||||
|
||||
namespace cvtest {
|
||||
namespace ocl {
|
||||
|
||||
OCL_TEST_F(SuperResolution, BTVL1)
|
||||
@@ -291,8 +298,10 @@ OCL_TEST_F(SuperResolution, BTVL1)
|
||||
RunTest<cv::UMat>(cv::superres::createSuperResolution_BTVL1());
|
||||
}
|
||||
|
||||
} } // namespace cvtest::ocl
|
||||
} // namespace opencv_test::ocl
|
||||
|
||||
#endif
|
||||
|
||||
#endif // HAVE_VIDEO_INPUT
|
||||
|
||||
} // namespace
|
||||
|
||||
Reference in New Issue
Block a user