generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid explicit std::string use

Browse Source
This commit is contained in:
Vadim Pisarevsky 2013-03-26 12:55:21 +04:00
parent f8b61e4eca
commit 322d781192
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/calib3d/src/stereobm.cpp
View File

@ -962,7 +962,8 @@ public:
void read(const FileNode& fn) 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.minDisparity = (int)fn["minDisparity"];
params.numDisparities = (int)fn["numDisparities"]; params.numDisparities = (int)fn["numDisparities"];
params.SADWindowSize = (int)fn["blockSize"]; params.SADWindowSize = (int)fn["blockSize"];

3
modules/calib3d/src/stereosgbm.cpp
View File

@ -918,7 +918,8 @@ public:
void read(const FileNode& fn) 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.minDisparity = (int)fn["minDisparity"];
params.numDisparities = (int)fn["numDisparities"]; params.numDisparities = (int)fn["numDisparities"];
params.SADWindowSize = (int)fn["blockSize"]; params.SADWindowSize = (int)fn["blockSize"];