diff --git a/modules/core/src/persistence_types.cpp b/modules/core/src/persistence_types.cpp index cd4fad05fb..5bf419ec06 100644 --- a/modules/core/src/persistence_types.cpp +++ b/modules/core/src/persistence_types.cpp @@ -12,7 +12,7 @@ void write( FileStorage& fs, const String& name, const Mat& m ) { char dt[22]; - if( m.dims <= 2 ) + if( m.dims == 2 || m.empty() ) { fs.startWriteStruct(name, FileNode::MAP, String("opencv-matrix")); fs << "rows" << m.rows; @@ -151,6 +151,8 @@ void read(const FileNode& node, Mat& m, const Mat& default_mat) CV_Assert(!data_node.empty()); size_t nelems = data_node.size(); + if (nelems == 0) + m = Mat(); CV_Assert(nelems == m.total()*m.channels()); data_node.readRaw(dt, (uchar*)m.ptr(), m.total()*m.elemSize()); diff --git a/modules/core/test/test_io.cpp b/modules/core/test/test_io.cpp index fd6cbace2d..be56329068 100644 --- a/modules/core/test/test_io.cpp +++ b/modules/core/test/test_io.cpp @@ -2025,4 +2025,49 @@ TEST(Core_InputOutput, FileStorage_invalid_attribute_value_regression_25946) ASSERT_EQ(0, std::remove(fileName.c_str())); } +template +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 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