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 pull request #26333 from vpisarev:fix_26322

Browse Source 
Fix #26322: construction of another Mat header for empty matrix #26333

The PR fixes #26322

- [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
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake
This commit is contained in:
Vadim Pisarevsky
2024-10-18 14:50:27 +03:00
committed by GitHub
parent 2f35847960
commit 6e3c5db1c6
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/test/test_mat.cpp
+22
View File
@@ -2647,4 +2647,26 @@ TEST(InputArray, dumpEmpty)
EXPECT_EQ(s, "InputArray: empty()=true kind=0x00010000 flags=0x01010000 total(-1)=0 dims(-1)=0 size(-1)=0x0 type(-1)=CV_8UC1");
}
TEST(Mat, regression_26322)
{
cv::Mat1b mat;
EXPECT_TRUE(mat.empty());
EXPECT_EQ(0, (int)mat.total());
cv::Mat mat2(mat.dims, mat.size.p, mat.type(), mat.data, mat.step.p);
EXPECT_TRUE(mat2.empty());
EXPECT_EQ(mat.cols, mat2.cols);
EXPECT_EQ(mat.rows, mat2.rows);
EXPECT_EQ(0, (int)(mat2.cols * mat2.rows * mat2.elemSize()));
EXPECT_EQ(0, (int)mat2.total());
// the new way of doing the same in 5.x
cv::Mat mat3(mat.shape(), mat.type(), mat.data, mat.step.p);
EXPECT_TRUE(mat3.empty());
EXPECT_EQ(mat.cols, mat3.cols);
EXPECT_EQ(mat.rows, mat3.rows);
EXPECT_EQ(0, (int)(mat3.cols * mat3.rows * mat3.elemSize()));
EXPECT_EQ(0, (int)mat3.total());
}
}} // namespace