avoid explicit std::string use

diff --git a/modules/calib3d/src/stereobm.cpp b/modules/calib3d/src/stereobm.cpp
index a005c66..7b583db 100644 (file)
--- a/modules/calib3d/src/stereobm.cpp
+++ b/modules/calib3d/src/stereobm.cpp
@@ -962,7 +962,8 @@ public:
 
     void read(const FileNode& fn)
     {
-        CV_Assert( (std::string)fn["name"] == std::string(name_) );
+        FileNode n = fn["name"];
+        CV_Assert( n.isString() && strcmp(n.node->data.str.ptr, name_) == 0 );
         params.minDisparity = (int)fn["minDisparity"];
         params.numDisparities = (int)fn["numDisparities"];
         params.SADWindowSize = (int)fn["blockSize"];

diff --git a/modules/calib3d/src/stereosgbm.cpp b/modules/calib3d/src/stereosgbm.cpp
index d46c411..160d926 100644 (file)
--- a/modules/calib3d/src/stereosgbm.cpp
+++ b/modules/calib3d/src/stereosgbm.cpp
@@ -918,7 +918,8 @@ public:
 
     void read(const FileNode& fn)
     {
-        CV_Assert( (std::string)fn["name"] == std::string(name_) );
+        FileNode n = fn["name"];
+        CV_Assert( n.isString() && strcmp(n.node->data.str.ptr, name_) == 0 );
         params.minDisparity = (int)fn["minDisparity"];
         params.numDisparities = (int)fn["numDisparities"];
         params.SADWindowSize = (int)fn["blockSize"];