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

diff --cc CMakeLists.txt
Simple merge

diff --cc cmake/OpenCVModule.cmake
index c66855a239dd3b17cdb7298c20fd973f4d858e6f,10ee4060327bd0a8bb69073853a867d47e4f0055..bd14aa23787378cbb45bd99c47d6b9dd14ee819f
--- 1/cmake/OpenCVModule.cmake
--- 2/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@@ -1360,12 -1337,8 +1360,12 @@@ function(ocv_add_samples
          endif()
          add_dependencies(${parent_target} ${the_target})
  
-         if(WIN32)
-           install(TARGETS ${the_target} RUNTIME DESTINATION "samples/${module_id}" COMPONENT samples)
 +        if(TARGET opencv_videoio_plugins)
 +          add_dependencies(${the_target} opencv_videoio_plugins)
 +        endif()
 +
+         if(INSTALL_BIN_EXAMPLES)
+           install(TARGETS ${the_target} RUNTIME DESTINATION "${OPENCV_SAMPLES_BIN_INSTALL_PATH}/${module_id}" COMPONENT samples)
          endif()
        endforeach()
      endif()

diff --cc modules/core/src/matrix_wrap.cpp
Simple merge

diff --cc modules/core/src/ocl.cpp
Simple merge

diff --cc modules/dnn/src/onnx/onnx_importer.cpp
Simple merge

diff --cc modules/dnn/test/test_onnx_importer.cpp
index 0c1aae016b546d588fcf4ab9951275fbea85386b,993ba56be412ff7d1334e5043af37eeace0dd73a..f9cfd290a9b38b75acfa877820c4ebfbeace4be7
--- 1/modules/dnn/test/test_onnx_importer.cpp
--- 2/modules/dnn/test/test_onnx_importer.cpp
+++ b/modules/dnn/test/test_onnx_importer.cpp
@@@ -275,19 -262,26 +275,31 @@@ TEST_P(Test_ONNX_layers, ReduceSum
      testONNXModels("reduce_sum");
  }
  
+ TEST_P(Test_ONNX_layers, ReduceMaxGlobal)
+ {
+     testONNXModels("reduce_max");
+ }
+ 
+ TEST_P(Test_ONNX_layers, Scale)
+ {
+     if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019)
+         applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER);
+     testONNXModels("scale");
+ }
+ 
  TEST_P(Test_ONNX_layers, ReduceMean3D)
  {
 -    if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019 && target != DNN_TARGET_CPU)
 +    if (backend == DNN_BACKEND_CUDA)
 +    {
 +        // ok
 +    }
 +    else if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019 && target != DNN_TARGET_CPU)
          applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER);  // Only CPU on DLIE backend is supported
 -    if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && target != DNN_TARGET_CPU)
 +    else if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && target != DNN_TARGET_CPU)
          applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NGRAPH);  // Only CPU on DLIE backend is supported
 -    if (target != DNN_TARGET_CPU)
 +    else if (target != DNN_TARGET_CPU)
          throw SkipTestException("Only CPU is supported");
 +
      testONNXModels("reduce_mean3d");
  }
  

diff --cc modules/imgcodecs/src/loadsave.cpp
Simple merge

diff --cc modules/videoio/doc/videoio_overview.markdown
Simple merge