Merge pull request #3511 from mattip:2.4

20d957d2 · Vadim Pisarevsky · 03df7831 · ff7ea605 · 20d957d2
Commit 20d957d2 authored Dec 22, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

core.hpp modules/core/include/opencv2/core/core.hpp +3 -3

No files found.
--- a/modules/core/include/opencv2/core/core.hpp
+++ b/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();