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

diff --cc modules/core/include/opencv2/core/cvdef.h
Simple merge

diff --cc modules/core/include/opencv2/core/utility.hpp
Simple merge

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

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

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

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

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

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

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

diff --cc modules/dnn/test/test_torch_importer.cpp
index bc9f59d,55ce803..682eceb
--- 1/modules/dnn/test/test_torch_importer.cpp
--- 2/modules/dnn/test/test_torch_importer.cpp
+++ b/modules/dnn/test/test_torch_importer.cpp
@@@ -391,8 -348,10 +396,12 @@@ TEST_P(Test_Torch_nets, ENet_accuracy
      checkBackend();
      if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16)
          throw SkipTestException("");
 +    if (backend == DNN_BACKEND_CUDA && target == DNN_TARGET_CUDA_FP16)
 +        applyTestTag(CV_TEST_TAG_DNN_SKIP_CUDA_FP16);
+ #if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2020010000)
+     if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019)
+         applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, CV_TEST_TAG_DNN_SKIP_IE_VERSION);
+ #else
      if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019 && target != DNN_TARGET_CPU)
      {
          if (target == DNN_TARGET_OPENCL_FP16) applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_OPENCL_FP16, CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER);

diff --cc modules/imgcodecs/include/opencv2/imgcodecs.hpp
index 143926b,319f6cb..89b014d
--- 1/modules/imgcodecs/include/opencv2/imgcodecs.hpp
--- 2/modules/imgcodecs/include/opencv2/imgcodecs.hpp
+++ b/modules/imgcodecs/include/opencv2/imgcodecs.hpp
@@@ -172,9 -170,9 +172,10 @@@ Currently, the following file formats a
      then the [GDAL](http://www.gdal.org) driver will be used in order to decode the image, supporting
      the following formats: [Raster](http://www.gdal.org/formats_list.html),
      [Vector](http://www.gdal.org/ogr_formats.html).
- -   If EXIF information are embedded in the image file, the EXIF orientation will be taken into account
-     and thus the image will be rotated accordingly except if the flag @ref IMREAD_IGNORE_ORIENTATION is passed.
+ -   If EXIF information is embedded in the image file, the EXIF orientation will be taken into account
+     and thus the image will be rotated accordingly except if the flags @ref IMREAD_IGNORE_ORIENTATION
+     or @ref IMREAD_UNCHANGED are passed.
 +-   Use the IMREAD_UNCHANGED flag to keep the floating point values from PFM image.
  -   By default number of pixels must be less than 2^30. Limit can be set using system
      variable OPENCV_IO_MAX_IMAGE_PIXELS
  

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

diff --cc modules/python/src2/cv2.cpp
Simple merge

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

diff --cc modules/videoio/src/cap_msmf.cpp
index f03ff91,24e26cf..ec3f909
--- 1/modules/videoio/src/cap_msmf.cpp
--- 2/modules/videoio/src/cap_msmf.cpp
+++ b/modules/videoio/src/cap_msmf.cpp
@@@ -1689,13 -1297,16 +1301,18 @@@ bool CvCapture_MSMF::setProperty( int p
              default:
                  return false;
              }
-             return configureOutput(requestedWidth, requestedHeight, getFramerate(nativeFormat), aspectN, aspectD, (int)cvRound(value), convertFormat);
 +        case CV_CAP_PROP_FOURCC:
++            return configureOutput(newFormat, (int)cvRound(value), convertFormat);
+         case CV_CAP_PROP_FORMAT:
+             return configureOutput(newFormat, (int)cvRound(value), convertFormat);
          case CV_CAP_PROP_CONVERT_RGB:
-             return configureOutput(requestedWidth, requestedHeight, getFramerate(nativeFormat), aspectN, aspectD, outputFormat, value != 0);
+             return configureOutput(newFormat, outputFormat, value != 0);
          case CV_CAP_PROP_SAR_NUM:
              if (value > 0)
-                 return configureOutput(requestedWidth, requestedHeight, getFramerate(nativeFormat), (UINT32)cvRound(value), aspectD, outputFormat, convertFormat);
+             {
+                 newFormat.aspectRatioNum = (UINT32)cvRound(value);
+                 return configureOutput(newFormat, outputFormat, convertFormat);
+             }
              break;
          case CV_CAP_PROP_SAR_DEN:
              if (value > 0)
@@@ -1711,8 -1331,13 +1337,11 @@@
              break;
          case CV_CAP_PROP_FPS:
              if (value >= 0)
-                 return configureOutput(requestedWidth, requestedHeight, value, aspectN, aspectD, outputFormat, convertFormat);
+             {
+                 newFormat.setFramerate(value);
+                 return configureOutput(newFormat, outputFormat, convertFormat);
+             }
              break;
 -            case CV_CAP_PROP_FOURCC:
 -                break;
          case CV_CAP_PROP_FRAME_COUNT:
              break;
          case CV_CAP_PROP_POS_AVI_RATIO:

diff --cc modules/videoio/test/test_video_io.cpp
Simple merge

diff --cc samples/CMakeLists.txt
Simple merge