Merge pull request #13232 from huangqinjin:openmp

2018-11-21 08:32:13 +00:00 · 2018-11-21 08:32:13 +00:00 · 45d2e18808
commit 45d2e18808
parent 6e67fd2752 e1ac8589f8
1 changed files with 1 additions and 1 deletions
--- a/modules/core/src/parallel.cpp
+++ b/modules/core/src/parallel.cpp
@ -427,7 +427,7 @@ static inline int _initMaxThreads()
    {
        omp_set_dynamic(maxThreads);
    }
-    return numThreads;
+    return maxThreads;
 }
 static int numThreadsMax = _initMaxThreads();
 #elif defined HAVE_GCD