Merge pull request opencv#9236 from dkurt:fix_json_bool

alalek · alalek · commit b4e300b78b20 · 2017-07-26T13:08:13.000Z
diff --git a/modules/core/src/persistence.cpp b/modules/core/src/persistence.cpp
@@ -3665,7 +3665,6 @@ static char* icvJSONParseValue( CvFileStorage* fs, char* ptr, CvFileNode* node )
         {
             CV_PARSE_ERROR( "Unrecognized value" );
         }
-        ptr++;
     }
 
     return ptr;
diff --git a/modules/core/test/test_io.cpp b/modules/core/test/test_io.cpp
@@ -1318,3 +1318,30 @@ TEST(Core_InputOutput, FileStorage_json_named_nodes)
     ASSERT_EQ(fs["array"].name(), "array");
     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();
+}

Original file line number	Diff line number	Diff line change
`@@ -3665,7 +3665,6 @@ static char* icvJSONParseValue( CvFileStorage* fs, char* ptr, CvFileNode* node )`
`3665`	`3665`	`{`
`3666`	`3666`	`CV_PARSE_ERROR( "Unrecognized value" );`
`3667`	`3667`	`}`
`3668`		`- ptr++;`
`3669`	`3668`	`}`
`3670`	`3669`
`3671`	`3670`	`return ptr;`