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

diff --cc cmake/OpenCVDetectCXXCompiler.cmake
index cea12ad,f9fc118..2cffad2
--- 1/cmake/OpenCVDetectCXXCompiler.cmake
--- 2/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
@@@ -211,11 -212,13 +211,17 @@@ if(NOT HAVE_CXX11
    endif()
  endif()
  
- if((HAVE_CXX11
 +if(NOT HAVE_CXX11)
 +  message(FATAL_ERROR "OpenCV 4.x requires C++11")
 +endif()
 +
+ set(__OPENCV_ENABLE_ATOMIC_LONG_LONG OFF)
+ if(HAVE_CXX11 AND (X86 OR X86_64))
+   set(__OPENCV_ENABLE_ATOMIC_LONG_LONG ON)
+ endif()
+ option(OPENCV_ENABLE_ATOMIC_LONG_LONG "Enable C++ compiler support for atomic<long long>" ${__OPENCV_ENABLE_ATOMIC_LONG_LONG})
+ 
+ if((HAVE_CXX11 AND OPENCV_ENABLE_ATOMIC_LONG_LONG
          AND NOT MSVC
          AND NOT (X86 OR X86_64)
      AND NOT OPENCV_SKIP_LIBATOMIC_COMPILER_CHECK)

diff --cc cmake/OpenCVModule.cmake
Simple merge

diff --cc modules/calib3d/include/opencv2/calib3d.hpp
Simple merge

diff --cc modules/calib3d/src/fundam.cpp
Simple merge

diff --cc modules/core/CMakeLists.txt
Simple merge

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

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

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

diff --cc modules/dnn/src/op_inf_engine.cpp
Simple merge

diff --cc modules/dnn/src/op_inf_engine.hpp
index 9468261,54bc769..6a2f736
--- 1/modules/dnn/src/op_inf_engine.hpp
--- 2/modules/dnn/src/op_inf_engine.hpp
+++ b/modules/dnn/src/op_inf_engine.hpp
@@@ -244,9 -243,9 +244,9 @@@ CV__DNN_INLINE_NS_BEGI
  
  bool isMyriadX();
  
 -CV__DNN_EXPERIMENTAL_NS_END
 +CV__DNN_INLINE_NS_END
  
- InferenceEngine::Core& getCore();
+ InferenceEngine::Core& getCore(const std::string& id);
  
  template<typename T = size_t>
  static inline std::vector<T> getShape(const Mat& mat)

diff --cc modules/dnn/src/tensorflow/tf_importer.cpp
Simple merge

diff --cc modules/dnn/test/test_onnx_importer.cpp
Simple merge

diff --cc modules/dnn/test/test_tf_importer.cpp
Simple merge