mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 06:03:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7039 from vpisarev:2_small_fixes

Browse Source
This commit is contained in:
Vadim Pisarevsky 2016-08-04 12:13:35 +00:00
commit 29afb83f24
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/ml/src/data.cpp
View File

@ -747,9 +747,6 @@ public:
} }
} }
while(*stopstring != ']'); while(*stopstring != ']');
if( stopstring[1] != '\0' && stopstring[1] != ',')
CV_Error( CV_StsBadArg, errmsg );
} }
} }

2
modules/ts/include/opencv2/ts/ts_perf.hpp
View File

@ -371,8 +371,8 @@ public:
class PerfSkipTestException: public cv::Exception class PerfSkipTestException: public cv::Exception
{ {
int dummy; // workaround for MacOSX Xcode 7.3 bug (don't make class "empty")
public: public:
int dummy; // workaround for MacOSX Xcode 7.3 bug (don't make class "empty")
PerfSkipTestException() : dummy(0) {} PerfSkipTestException() : dummy(0) {}
}; };