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

Merge pull request #3511 from mattip:2.4

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-12-22 10:41:20 +00:00
parent 03df7831ab ff7ea605ef
commit 20d957d212
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/include/opencv2/core/core.hpp
View File

@@ -230,9 +230,9 @@ CV_EXPORTS ErrorCallback redirectError( ErrorCallback errCallback,
CV_EXPORTS void glob(String pattern, std::vector<String>& result, bool recursive = false);
CV_EXPORTS void setNumThreads(int nthreads);
CV_EXPORTS int getNumThreads();
CV_EXPORTS int getThreadNum();
CV_EXPORTS_W void setNumThreads(int nthreads);
CV_EXPORTS_W int getNumThreads();
CV_EXPORTS_W int getThreadNum();
CV_EXPORTS_W const string& getBuildInformation();