1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00

Merge pull request #26420 from dkurt:fs_mat_0d_1d

Support 0d/1d Mat in FileStorage #26420

### 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
- [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:
Dmitry Kurtaev
2024-11-06 08:11:59 +03:00
committed by GitHub
parent ef0d83643d
commit 286f7524bb
2 changed files with 48 additions and 1 deletions
+45
View File
@@ -2025,4 +2025,49 @@ TEST(Core_InputOutput, FileStorage_invalid_attribute_value_regression_25946)
ASSERT_EQ(0, std::remove(fileName.c_str()));
}
template <typename T>
T fsWriteRead(const T& expectedValue, const char* ext)
{
std::string fname = cv::tempfile(ext);
FileStorage fs_w(fname, FileStorage::WRITE);
fs_w << "value" << expectedValue;
fs_w.release();
FileStorage fs_r(fname, FileStorage::READ);
T value;
fs_r["value"] >> value;
return value;
}
void testExactMat(const Mat& src, const char* ext)
{
bool srcIsEmpty = src.empty();
Mat dst = fsWriteRead(src, ext);
EXPECT_EQ(dst.empty(), srcIsEmpty);
EXPECT_EQ(src.dims, dst.dims);
EXPECT_EQ(src.size, dst.size);
EXPECT_EQ(cv::norm(src, dst, NORM_INF), 0.0);
}
typedef testing::TestWithParam<const char*> FileStorage_exact_type;
TEST_P(FileStorage_exact_type, empty_mat)
{
testExactMat(Mat(), GetParam());
}
TEST_P(FileStorage_exact_type, mat_0d)
{
testExactMat(Mat({}, CV_32S, Scalar(8)), GetParam());
}
TEST_P(FileStorage_exact_type, mat_1d)
{
testExactMat(Mat({1}, CV_32S, Scalar(8)), GetParam());
}
INSTANTIATE_TEST_CASE_P(Core_InputOutput,
FileStorage_exact_type, Values(".yml", ".xml", ".json")
);
}} // namespace