mirror of
https://github.com/opencv/opencv.git
synced 2026-09-25 04:09:57 +03:00
Merge pull request #29948 from vrabaud:comma_initializer
Remove deprecated CommaInitializer API - #29948 This goes hand in hand with https://github.com/opencv/opencv_contrib/pull/4217 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
This commit is contained in:
@@ -50,7 +50,7 @@ static double maxAbsDiff(const T &t, const U &u)
|
||||
|
||||
TEST(Core_OutputArrayAssign, _Matxd_Matd)
|
||||
{
|
||||
Mat expected = (Mat_<double>(2,3) << 1, 2, 3, .1, .2, .3);
|
||||
Mat expected = Mat_<double>({2, 3}, {1, 2, 3, .1, .2, .3});
|
||||
Matx23d actualx;
|
||||
|
||||
{
|
||||
@@ -65,7 +65,7 @@ TEST(Core_OutputArrayAssign, _Matxd_Matd)
|
||||
|
||||
TEST(Core_OutputArrayAssign, _Matxd_Matf)
|
||||
{
|
||||
Mat expected = (Mat_<float>(2,3) << 1, 2, 3, .1, .2, .3);
|
||||
Mat expected = Mat_<float>({2, 3}, {1.f, 2.f, 3.f, .1f, .2f, .3f});
|
||||
Matx23d actualx;
|
||||
|
||||
{
|
||||
@@ -80,7 +80,7 @@ TEST(Core_OutputArrayAssign, _Matxd_Matf)
|
||||
|
||||
TEST(Core_OutputArrayAssign, _Matxf_Matd)
|
||||
{
|
||||
Mat expected = (Mat_<double>(2,3) << 1, 2, 3, .1, .2, .3);
|
||||
Mat expected = Mat_<double>({2, 3}, {1, 2, 3, .1, .2, .3});
|
||||
Matx23f actualx;
|
||||
|
||||
{
|
||||
@@ -95,7 +95,7 @@ TEST(Core_OutputArrayAssign, _Matxf_Matd)
|
||||
|
||||
TEST(Core_OutputArrayAssign, _Matxd_UMatd)
|
||||
{
|
||||
Mat expected = (Mat_<double>(2,3) << 1, 2, 3, .1, .2, .3);
|
||||
Mat expected = Mat_<double>({2, 3}, {1, 2, 3, .1, .2, .3});
|
||||
UMat uexpected = expected.getUMat(ACCESS_READ);
|
||||
Matx23d actualx;
|
||||
|
||||
@@ -111,7 +111,7 @@ TEST(Core_OutputArrayAssign, _Matxd_UMatd)
|
||||
|
||||
TEST(Core_OutputArrayAssign, _Matxd_UMatf)
|
||||
{
|
||||
Mat expected = (Mat_<float>(2,3) << 1, 2, 3, .1, .2, .3);
|
||||
Mat expected = Mat_<float>({2, 3}, {1.f, 2.f, 3.f, .1f, .2f, .3f});
|
||||
UMat uexpected = expected.getUMat(ACCESS_READ);
|
||||
Matx23d actualx;
|
||||
|
||||
@@ -127,7 +127,7 @@ TEST(Core_OutputArrayAssign, _Matxd_UMatf)
|
||||
|
||||
TEST(Core_OutputArrayAssign, _Matxf_UMatd)
|
||||
{
|
||||
Mat expected = (Mat_<double>(2,3) << 1, 2, 3, .1, .2, .3);
|
||||
Mat expected = Mat_<double>({2, 3}, {1, 2, 3, .1, .2, .3});
|
||||
UMat uexpected = expected.getUMat(ACCESS_READ);
|
||||
Matx23f actualx;
|
||||
|
||||
@@ -212,7 +212,7 @@ TEST(Core_String, end_method_regression)
|
||||
|
||||
TEST(Core_Copy, repeat_regression_8972)
|
||||
{
|
||||
Mat src = (Mat_<int>(1, 4) << 1, 2, 3, 4);
|
||||
Mat src = Mat_<int>({1, 4}, {1, 2, 3, 4});
|
||||
|
||||
ASSERT_ANY_THROW({
|
||||
repeat(src, 5, 1, src);
|
||||
|
||||
Reference in New Issue
Block a user