mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-03 08:19:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6383 from alalek:backport_6381

Browse Source
This commit is contained in:
Maksim Shabunin 2016-04-12 08:40:01 +00:00
commit ff3bb9f4e6
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5248,7 +5248,7 @@ FileStorage& operator << (FileStorage& fs, const string& str)
} }
else if( fs.state == NAME_EXPECTED + INSIDE_MAP ) else if( fs.state == NAME_EXPECTED + INSIDE_MAP )
{ {
if( !cv_isalpha(*_str) ) if (!cv_isalpha(*_str) && *_str != '_')
CV_Error_( CV_StsError, ("Incorrect element name %s", _str) ); CV_Error_( CV_StsError, ("Incorrect element name %s", _str) );
fs.elname = str; fs.elname = str;
fs.state = VALUE_EXPECTED + INSIDE_MAP; fs.state = VALUE_EXPECTED + INSIDE_MAP;

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

@ -522,3 +522,14 @@ TEST(Core_InputOutput, FileStorage)
sprintf(arr, "sprintf is hell %d", 666); sprintf(arr, "sprintf is hell %d", 666);
EXPECT_NO_THROW(f << arr); EXPECT_NO_THROW(f << arr);
} }
TEST(Core_InputOutput, FileStorageKey)
{
cv::FileStorage f("dummy.yml", cv::FileStorage::WRITE | cv::FileStorage::MEMORY);
EXPECT_NO_THROW(f << "key1" << "value1");
EXPECT_NO_THROW(f << "_key2" << "value2");
EXPECT_NO_THROW(f << "key_3" << "value3");
const std::string expected = "%YAML:1.0\nkey1: value1\n_key2: value2\nkey_3: value3\n";
ASSERT_STREQ(f.releaseAndGetString().c_str(), expected.c_str());
}