Merge pull request opencv#8975 from sovrasov:fs_additional_errors

alalek · alalek · commit 11626fe32c18 · 2017-07-14T17:13:50.000Z
diff --git a/modules/core/include/opencv2/core/cvstd.inl.hpp b/modules/core/include/opencv2/core/cvstd.inl.hpp
@@ -153,9 +153,7 @@ FileNode::operator std::string() const
 template<> inline
 void operator >> (const FileNode& n, std::string& value)
 {
-    String val;
-    read(n, val, val);
-    value = val;
+    read(n, value, std::string());
 }
 
 template<> inline
diff --git a/modules/core/include/opencv2/core/persistence.hpp b/modules/core/include/opencv2/core/persistence.hpp
@@ -712,6 +712,7 @@ CV_EXPORTS void read(const FileNode& node, int& value, int default_value);
 CV_EXPORTS void read(const FileNode& node, float& value, float default_value);
 CV_EXPORTS void read(const FileNode& node, double& value, double default_value);
 CV_EXPORTS void read(const FileNode& node, String& value, const String& default_value);
+CV_EXPORTS void read(const FileNode& node, std::string& value, const std::string& default_value);
 CV_EXPORTS void read(const FileNode& node, Mat& mat, const Mat& default_mat = Mat() );
 CV_EXPORTS void read(const FileNode& node, SparseMat& mat, const SparseMat& default_mat = SparseMat() );
 CV_EXPORTS void read(const FileNode& node, std::vector<KeyPoint>& keypoints);
diff --git a/modules/core/src/persistence.cpp b/modules/core/src/persistence.cpp
@@ -7374,29 +7374,33 @@ size_t FileNode::size() const
 void read(const FileNode& node, int& value, int default_value)
 {
     value = !node.node ? default_value :
-    CV_NODE_IS_INT(node.node->tag) ? node.node->data.i :
-    CV_NODE_IS_REAL(node.node->tag) ? cvRound(node.node->data.f) : 0x7fffffff;
+    CV_NODE_IS_INT(node.node->tag) ? node.node->data.i : std::numeric_limits<int>::max();
 }
 
 void read(const FileNode& node, float& value, float default_value)
 {
     value = !node.node ? default_value :
         CV_NODE_IS_INT(node.node->tag) ? (float)node.node->data.i :
-        CV_NODE_IS_REAL(node.node->tag) ? (float)node.node->data.f : 1e30f;
+        CV_NODE_IS_REAL(node.node->tag) ? saturate_cast<float>(node.node->data.f) : std::numeric_limits<float>::max();
 }
 
 void read(const FileNode& node, double& value, double default_value)
 {
     value = !node.node ? default_value :
         CV_NODE_IS_INT(node.node->tag) ? (double)node.node->data.i :
-        CV_NODE_IS_REAL(node.node->tag) ? node.node->data.f : 1e300;
+        CV_NODE_IS_REAL(node.node->tag) ? node.node->data.f : std::numeric_limits<double>::max();
 }
 
 void read(const FileNode& node, String& value, const String& default_value)
 {
     value = !node.node ? default_value : CV_NODE_IS_STRING(node.node->tag) ? String(node.node->data.str.ptr) : String();
 }
 
+void read(const FileNode& node, std::string& value, const std::string& default_value)
+{
+    value = !node.node ? default_value : CV_NODE_IS_STRING(node.node->tag) ? std::string(node.node->data.str.ptr) : default_value;
+}
+
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -153,9 +153,7 @@ FileNode::operator std::string() const`
`153`	`153`	`template<> inline`
`154`	`154`	`void operator >> (const FileNode& n, std::string& value)`
`155`	`155`	`{`
`156`		`- String val;`
`157`		`- read(n, val, val);`
`158`		`- value = val;`
	`156`	`+ read(n, value, std::string());`
`159`	`157`	`}`
`160`	`158`
`161`	`159`	`template<> inline`
Original file line number	Diff line number	Diff line change
`@@ -7374,29 +7374,33 @@ size_t FileNode::size() const`
`7374`	`7374`	`void read(const FileNode& node, int& value, int default_value)`
`7375`	`7375`	`{`
`7376`	`7376`	`value = !node.node ? default_value :`
`7377`		`- CV_NODE_IS_INT(node.node->tag) ? node.node->data.i :`
`7378`		`- CV_NODE_IS_REAL(node.node->tag) ? cvRound(node.node->data.f) : 0x7fffffff;`
	`7377`	`+ CV_NODE_IS_INT(node.node->tag) ? node.node->data.i : std::numeric_limits<int>::max();`
`7379`	`7378`	`}`
`7380`	`7379`
`7381`	`7380`	`void read(const FileNode& node, float& value, float default_value)`
`7382`	`7381`	`{`
`7383`	`7382`	`value = !node.node ? default_value :`
`7384`	`7383`	`CV_NODE_IS_INT(node.node->tag) ? (float)node.node->data.i :`
`7385`		`- CV_NODE_IS_REAL(node.node->tag) ? (float)node.node->data.f : 1e30f;`
	`7384`	`+ CV_NODE_IS_REAL(node.node->tag) ? saturate_cast<float>(node.node->data.f) : std::numeric_limits<float>::max();`
`7386`	`7385`	`}`
`7387`	`7386`
`7388`	`7387`	`void read(const FileNode& node, double& value, double default_value)`
`7389`	`7388`	`{`
`7390`	`7389`	`value = !node.node ? default_value :`
`7391`	`7390`	`CV_NODE_IS_INT(node.node->tag) ? (double)node.node->data.i :`
`7392`		`- CV_NODE_IS_REAL(node.node->tag) ? node.node->data.f : 1e300;`
	`7391`	`+ CV_NODE_IS_REAL(node.node->tag) ? node.node->data.f : std::numeric_limits<double>::max();`
`7393`	`7392`	`}`
`7394`	`7393`
`7395`	`7394`	`void read(const FileNode& node, String& value, const String& default_value)`
`7396`	`7395`	`{`
`7397`	`7396`	`value = !node.node ? default_value : CV_NODE_IS_STRING(node.node->tag) ? String(node.node->data.str.ptr) : String();`
`7398`	`7397`	`}`
`7399`	`7398`
	`7399`	`+void read(const FileNode& node, std::string& value, const std::string& default_value)`
	`7400`	`+{`
	`7401`	`+ value = !node.node ? default_value : CV_NODE_IS_STRING(node.node->tag) ? std::string(node.node->data.str.ptr) : default_value;`
	`7402`	`+}`
	`7403`	`+`
`7400`	`7404`	`}`
`7401`	`7405`
`7402`	`7406`