add std::string overload for cv::read()

PkLab.net · sovrasov · commit 6dd9e18b2e1c · 2017-07-12T15:51:11.000+03:00
diff --git a/modules/core/include/opencv2/core/cvstd.inl.hpp b/modules/core/include/opencv2/core/cvstd.inl.hpp
@@ -156,9 +156,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
@@ -714,6 +714,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
@@ -7396,6 +7396,11 @@ 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
`@@ -156,9 +156,7 @@ FileNode::operator std::string() const`
`156`	`156`	`template<> inline`
`157`	`157`	`void operator >> (const FileNode& n, std::string& value)`
`158`	`158`	`{`
`159`		`- String val;`
`160`		`- read(n, val, val);`
`161`		`- value = val;`
	`159`	`+ read(n, value, std::string());`
`162`	`160`	`}`
`163`	`161`
`164`	`162`	`template<> inline`
Original file line number	Diff line number	Diff line change
`@@ -7396,6 +7396,11 @@ void read(const FileNode& node, String& value, const String& default_value)`
`7396`	`7396`	`value = !node.node ? default_value : CV_NODE_IS_STRING(node.node->tag) ? String(node.node->data.str.ptr) : String();`
`7397`	`7397`	`}`
`7398`	`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`	`+`
`7399`	`7404`	`}`
`7400`	`7405`
`7401`	`7406`