potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2023-07-27 18:38:25 +03:00
parent 0e8748746f 677a28fd2a
commit 47188b7c7e
151 changed files with 5199 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ts/include/opencv2/ts/cuda_test.hpp
+5
View File
@@ -202,6 +202,11 @@ namespace cvtest
{ \
UnsafeTestBody(); \
} \
catch (const cvtest::details::SkipTestExceptionBase& e) \
{ \
printf("[ SKIP ] %s\n", e.what()); \
cv::cuda::resetDevice(); \
} \
catch (...) \
{ \
cv::cuda::resetDevice(); \
modules/ts/include/opencv2/ts/ts_gtest.h
+8 -7
View File
@@ -17501,6 +17501,7 @@ CartesianProductHolder2(const Generator1& g1, const Generator2& g2)
static_cast<ParamGenerator<T2> >(g2_)));
}
CartesianProductHolder2(const CartesianProductHolder2 & other) = default;
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder2& other) = delete;
@@ -17523,7 +17524,7 @@ CartesianProductHolder3(const Generator1& g1, const Generator2& g2,
static_cast<ParamGenerator<T2> >(g2_),
static_cast<ParamGenerator<T3> >(g3_)));
}
CartesianProductHolder3(const CartesianProductHolder3 &) = default;
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder3& other) = delete;
@@ -17549,7 +17550,7 @@ CartesianProductHolder4(const Generator1& g1, const Generator2& g2,
static_cast<ParamGenerator<T3> >(g3_),
static_cast<ParamGenerator<T4> >(g4_)));
}
CartesianProductHolder4(const CartesianProductHolder4 &) = default;
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder4& other) = delete;
@@ -17577,7 +17578,7 @@ CartesianProductHolder5(const Generator1& g1, const Generator2& g2,
static_cast<ParamGenerator<T4> >(g4_),
static_cast<ParamGenerator<T5> >(g5_)));
}
CartesianProductHolder5(const CartesianProductHolder5 &) = default;
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder5& other) = delete;
@@ -17609,7 +17610,7 @@ CartesianProductHolder6(const Generator1& g1, const Generator2& g2,
static_cast<ParamGenerator<T5> >(g5_),
static_cast<ParamGenerator<T6> >(g6_)));
}
CartesianProductHolder6(const CartesianProductHolder6 &) = default;
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder6& other) = delete;
@@ -17644,7 +17645,7 @@ CartesianProductHolder7(const Generator1& g1, const Generator2& g2,
static_cast<ParamGenerator<T6> >(g6_),
static_cast<ParamGenerator<T7> >(g7_)));
}
CartesianProductHolder7(const CartesianProductHolder7 &) = default;
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder7& other) = delete;
@@ -17683,7 +17684,7 @@ CartesianProductHolder8(const Generator1& g1, const Generator2& g2,
static_cast<ParamGenerator<T7> >(g7_),
static_cast<ParamGenerator<T8> >(g8_)));
}
CartesianProductHolder8(const CartesianProductHolder8 &) = default;
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder8& other) = delete;
@@ -17726,7 +17727,7 @@ CartesianProductHolder9(const Generator1& g1, const Generator2& g2,
static_cast<ParamGenerator<T8> >(g8_),
static_cast<ParamGenerator<T9> >(g9_)));
}
CartesianProductHolder9(const CartesianProductHolder9 &) = default;
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder9& other) = delete;