From 322d781192d68364dbb97b9a4904d1a40a50efe7 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 26 Mar 2013 12:55:21 +0400 Subject: [PATCH] avoid explicit std::string use --- modules/calib3d/src/stereobm.cpp | 3 ++- modules/calib3d/src/stereosgbm.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/calib3d/src/stereobm.cpp b/modules/calib3d/src/stereobm.cpp index a005c66d2..7b583dbe3 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 d46c4110c..160d92637 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"];