potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #9236 from dkurt:fix_json_bool

Browse Source
This commit is contained in:
Alexander Alekhin
2017-07-26 13:08:13 +00:00
parent 402a77e7f7 583b327523
commit b4e300b78b
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/persistence.cpp
-1
View File
@@ -3665,7 +3665,6 @@ static char* icvJSONParseValue( CvFileStorage* fs, char* ptr, CvFileNode* node )
{ {
CV_PARSE_ERROR( "Unrecognized value" ); CV_PARSE_ERROR( "Unrecognized value" );
} }
ptr++;
} }
return ptr; return ptr;
modules/core/test/test_io.cpp
+27
View File
@@ -1318,3 +1318,30 @@ TEST(Core_InputOutput, FileStorage_json_named_nodes)
ASSERT_EQ(fs["array"].name(), "array"); ASSERT_EQ(fs["array"].name(), "array");
fs.release(); fs.release();
} }
TEST(Core_InputOutput, FileStorage_json_bool)
{
std::string test =
"{ "
"\"str_true\": \"true\","
"\"map_value\": {"
"\"int_value\": -33333,\n"
"\"bool_true\": true,"
"\"str_false\": \"false\","
"},"
"\"bool_false\": false, \n"
"\"array\": [0.1, 0.2]"
"}";
FileStorage fs(test, FileStorage::READ | FileStorage::MEMORY);
ASSERT_TRUE(fs["str_true"].isString());
ASSERT_TRUE(fs["map_value"]["bool_true"].isInt());
ASSERT_TRUE(fs["map_value"]["str_false"].isString());
ASSERT_TRUE(fs["bool_false"].isInt());
ASSERT_EQ((std::string)fs["str_true"], "true");
ASSERT_EQ((int)fs["map_value"]["bool_true"], 1);
ASSERT_EQ((std::string)fs["map_value"]["str_false"], "false");
ASSERT_EQ((int)fs["bool_false"], 0);
fs.release();
}