Merge pull request #3511 from mattip:2.4

pull/3543/head
Vadim Pisarevsky 11 years ago
commit 20d957d212
  1. 6
      modules/core/include/opencv2/core/core.hpp

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

Loading…
Cancel
Save