mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

core(persistence): fix processing of multiple documents

Browse Source
This commit is contained in:
Alexander Alekhin 2019-11-05 18:28:15 +03:00
parent c4c4ac28dc
commit dcf72e49e2
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/core/src/persistence.cpp
View File

@ -1900,18 +1900,19 @@ int FileStorage::getFormat() const
FileNode FileStorage::operator [](const char* key) const FileNode FileStorage::operator [](const char* key) const
{ {
if( p->roots.empty() ) return this->operator[](std::string(key));
return FileNode();
return p->roots[0][key];
} }
FileNode FileStorage::operator [](const std::string& key) const FileNode FileStorage::operator [](const std::string& key) const
{ {
if( p->roots.empty() ) FileNode res;
return FileNode(); for (size_t i = 0; i < p->roots.size(); i++)
{
return p->roots[0][key]; res = p->roots[i][key];
if (!res.empty())
break;
}
return res;
} }
String FileStorage::releaseAndGetString() String FileStorage::releaseAndGetString()

14
modules/core/test/test_io.cpp
View File

@ -1654,9 +1654,19 @@ TEST(Core_InputOutput, FileStorage_YAML_parse_multiple_documents)
fs.release(); fs.release();
fs.open(filename, FileStorage::READ); fs.open(filename, FileStorage::READ);
ASSERT_EQ(42, (int)fs["a"]);
ASSERT_EQ(1988, (int)fs["b"]); EXPECT_EQ(42, (int)fs["a"]);
EXPECT_EQ(1988, (int)fs["b"]);
EXPECT_EQ(42, (int)fs.root(0)["a"]);
EXPECT_TRUE(fs.root(0)["b"].empty());
EXPECT_TRUE(fs.root(1)["a"].empty());
EXPECT_EQ(1988, (int)fs.root(1)["b"]);
fs.release(); fs.release();
ASSERT_EQ(0, std::remove(filename.c_str()));
} }
}} // namespace }} // namespace