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:
@@ -49,7 +49,7 @@
|
||||
|
||||
#ifdef HAVE_OPENCL
|
||||
|
||||
namespace cvtest {
|
||||
namespace opencv_test {
|
||||
namespace ocl {
|
||||
|
||||
///////////// Merge////////////////////////
|
||||
@@ -156,7 +156,7 @@ OCL_PERF_TEST_P(MixChannelsFixture, MixChannels,
|
||||
|
||||
///////////// InsertChannel ////////////////////////
|
||||
|
||||
typedef std::tr1::tuple<cv::Size, MatDepth> Size_MatDepth_t;
|
||||
typedef tuple<cv::Size, MatDepth> Size_MatDepth_t;
|
||||
typedef TestBaseWithParam<Size_MatDepth_t> Size_MatDepth;
|
||||
|
||||
typedef Size_MatDepth InsertChannelFixture;
|
||||
@@ -201,6 +201,6 @@ OCL_PERF_TEST_P(ExtractChannelFixture, ExtractChannel,
|
||||
SANITY_CHECK(dst);
|
||||
}
|
||||
|
||||
} } // namespace cvtest::ocl
|
||||
} } // namespace opencv_test::ocl
|
||||
|
||||
#endif // HAVE_OPENCL
|
||||
|
||||
Reference in New Issue
Block a user