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 remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-10-11 23:40:55 +00:00
parent f1fdfa1a51 28cb714a09
commit 1ed9ff17e1
25 changed files with 2921 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/parallel.cpp
+10 -1
View File
@@ -447,7 +447,16 @@ static int numThreads = -1;
#elif defined HAVE_HPX
// nothing for HPX
#elif defined HAVE_OPENMP
static int numThreadsMax = omp_get_max_threads();
static inline int _initMaxThreads()
{
int maxThreads = omp_get_max_threads();
if (!utils::getConfigurationParameterBool("OPENCV_FOR_OPENMP_DYNAMIC_DISABLE", false))
{
omp_set_dynamic(maxThreads);
}
return numThreads;
}
static int numThreadsMax = _initMaxThreads();
#elif defined HAVE_GCD
// nothing for GCD
#elif defined WINRT