Merge pull request #3511 from mattip:2.4

This commit is contained in:
Vadim Pisarevsky 2014-12-22 10:41:20 +00:00
commit 20d957d212

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();