potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 07:13:02 +04:00
Code Packages 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
parent b2698f24b0 d7ee62f03b
commit 29afb83f24
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ml/src/data.cpp
-3
View File
@@ -747,9 +747,6 @@ public:
}
}
while(*stopstring != ']');
if( stopstring[1] != '\0' && stopstring[1] != ',')
CV_Error( CV_StsBadArg, errmsg );
}
}
modules/ts/include/opencv2/ts/ts_perf.hpp
+1 -1
View File
@@ -371,8 +371,8 @@ public:
class PerfSkipTestException: public cv::Exception
{
int dummy; // workaround for MacOSX Xcode 7.3 bug (don't make class "empty")
public:
int dummy; // workaround for MacOSX Xcode 7.3 bug (don't make class "empty")
PerfSkipTestException() : dummy(0) {}
};