From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Thu, 11 Oct 2018 23:40:55 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/3.4' into merge-3.4
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~512
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ed9ff17e15ae0801da97167ef503ac88f294f77;p=platform%2Fupstream%2Fopencv.git

Merge remote-tracking branch 'upstream/3.4' into merge-3.4
---

1ed9ff17e15ae0801da97167ef503ac88f294f77
diff --cc CMakeLists.txt
index e54b77e,de27a74..46b64ab
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -282,7 -282,7 +282,8 @@@ OCV_OPTION(WITH_PROTOBUF       "Enable 
  OCV_OPTION(WITH_IMGCODEC_HDR   "Include HDR support"                         ON)
  OCV_OPTION(WITH_IMGCODEC_SUNRASTER "Include SUNRASTER support"               ON)
  OCV_OPTION(WITH_IMGCODEC_PXM   "Include PNM (PBM,PGM,PPM) and PAM formats support" ON)
 +OCV_OPTION(WITH_IMGCODEC_PFM   "Include PFM formats support"                 ON)
+ OCV_OPTION(WITH_QUIRC          "Include library QR-code decoding"            ON)
  
  # OpenCV build components
  # ===================================================
diff --cc modules/core/src/parallel.cpp
index 93c8c26,a32f2f1..d74e377
--- a/modules/core/src/parallel.cpp
+++ b/modules/core/src/parallel.cpp
@@@ -444,10 -417,19 +444,19 @@@ static int numThreads = -1
      #else
          static tbb::task_scheduler_init tbbScheduler(tbb::task_scheduler_init::deferred);
      #endif
 -#elif defined HAVE_CSTRIPES
 -// nothing for C=
 +#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
diff --cc platforms/js/build_js.py
index 2e55b7b,b4d1737..9b7776c
--- a/platforms/js/build_js.py
+++ b/platforms/js/build_js.py
@@@ -113,11 -112,10 +113,11 @@@ class Builder
                 "-DWITH_ITT=OFF",
                 "-DBUILD_ZLIB=ON",
                 "-DBUILD_opencv_apps=OFF",
-                "-DBUILD_opencv_calib3d=ON",
+                "-DBUILD_opencv_calib3d=ON",  # No bindings provided. This module is used as a dependency for other modules.
                 "-DBUILD_opencv_dnn=ON",
                 "-DBUILD_opencv_features2d=ON",
--               "-DBUILD_opencv_flann=OFF",
++               "-DBUILD_opencv_flann=ON",  # No bindings provided. This module is used as a dependency for other modules.
 +               "-DBUILD_opencv_gapi=OFF",
                 "-DBUILD_opencv_ml=OFF",
                 "-DBUILD_opencv_photo=OFF",
                 "-DBUILD_opencv_imgcodecs=OFF",