From: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Tue, 26 Mar 2013 08:55:21 +0000 (+0400)
Subject: avoid explicit std::string use
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~1108^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=322d781192d68364dbb97b9a4904d1a40a50efe7;p=profile%2Fivi%2Fopencv.git

avoid explicit std::string use
---

diff --git a/modules/calib3d/src/stereobm.cpp b/modules/calib3d/src/stereobm.cpp
index a005c66..7b583db 100644
--- 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
--- 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"];