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

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

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

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

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

diff --cc modules/imgcodecs/src/loadsave.cpp
index 1536deb,c8fcbea..350042c
--- 1/modules/imgcodecs/src/loadsave.cpp
--- 2/modules/imgcodecs/src/loadsave.cpp
+++ b/modules/imgcodecs/src/loadsave.cpp
@@@ -515,10 -501,17 +482,16 @@@ imread_( const String& filename, int fl
  
      if( decoder->setScale( scale_denom ) > 1 ) // if decoder is JpegDecoder then decoder->setScale always returns 1
      {
 -        resize( *mat, *mat, Size( size.width / scale_denom, size.height / scale_denom ), 0, 0, INTER_LINEAR_EXACT);
 +        resize( mat, mat, Size( size.width / scale_denom, size.height / scale_denom ), 0, 0, INTER_LINEAR_EXACT);
      }
  
 -    if( mat && !mat->empty() && (flags & IMREAD_IGNORE_ORIENTATION) == 0 && flags != IMREAD_UNCHANGED )
+     /// optionally rotate the data if EXIF orientation flag says so
 -        ApplyExifOrientation(decoder->getExifTag(ORIENTATION), *mat);
++    if (!mat.empty() && (flags & IMREAD_IGNORE_ORIENTATION) == 0 && flags != IMREAD_UNCHANGED )
+     {
 -    return hdrtype == LOAD_CVMAT ? (void*)matrix :
 -        hdrtype == LOAD_IMAGE ? (void*)image : (void*)mat;
++        ApplyExifOrientation(decoder->getExifTag(ORIENTATION), mat);
+     }
+ 
 +    return true;
  }
  
  
@@@ -643,14 -636,8 +616,8 @@@ Mat imread( const String& filename, in
      Mat img;
  
      /// load the data
 -    imread_( filename, flags, LOAD_MAT, &img );
 +    imread_( filename, flags, img );
  
-     /// optionally rotate the data if EXIF' orientation flag says so
-     if( !img.empty() && (flags & IMREAD_IGNORE_ORIENTATION) == 0 && flags != IMREAD_UNCHANGED )
-     {
-         ApplyExifOrientation(filename, img);
-     }
- 
      /// return a reference to the data
      return img;
  }
@@@ -886,10 -896,19 +853,16 @@@ imdecode_( const Mat& buf, int flags, M
  
      if( decoder->setScale( scale_denom ) > 1 ) // if decoder is JpegDecoder then decoder->setScale always returns 1
      {
 -        resize( *mat, *mat, Size( size.width / scale_denom, size.height / scale_denom ), 0, 0, INTER_LINEAR_EXACT);
 +        resize(mat, mat, Size( size.width / scale_denom, size.height / scale_denom ), 0, 0, INTER_LINEAR_EXACT);
      }
  
 -    if (!mat->empty() && (flags & IMREAD_IGNORE_ORIENTATION) == 0 && flags != IMREAD_UNCHANGED)
+     /// optionally rotate the data if EXIF' orientation flag says so
 -        ApplyExifOrientation(decoder->getExifTag(ORIENTATION), *mat);
++    if (!mat.empty() && (flags & IMREAD_IGNORE_ORIENTATION) == 0 && flags != IMREAD_UNCHANGED)
+     {
 -    decoder.release();
 -
 -    return hdrtype == LOAD_CVMAT ? (void*)matrix :
 -        hdrtype == LOAD_IMAGE ? (void*)image : (void*)mat;
++        ApplyExifOrientation(decoder->getExifTag(ORIENTATION), mat);
+     }
+ 
 +    return true;
  }
  
  
@@@ -898,14 -917,8 +871,8 @@@ Mat imdecode( InputArray _buf, int flag
      CV_TRACE_FUNCTION();
  
      Mat buf = _buf.getMat(), img;
 -    imdecode_( buf, flags, LOAD_MAT, &img );
 +    imdecode_( buf, flags, img );
  
-     /// optionally rotate the data if EXIF' orientation flag says so
-     if( !img.empty() && (flags & IMREAD_IGNORE_ORIENTATION) == 0 && flags != IMREAD_UNCHANGED )
-     {
-         ApplyExifOrientation(buf, img);
-     }
- 
      return img;
  }
  
@@@ -915,14 -928,8 +882,8 @@@ Mat imdecode( InputArray _buf, int flag
  
      Mat buf = _buf.getMat(), img;
      dst = dst ? dst : &img;
 -    imdecode_( buf, flags, LOAD_MAT, dst );
 +    imdecode_( buf, flags, *dst );
  
-     /// optionally rotate the data if EXIF' orientation flag says so
-     if( !dst->empty() && (flags & IMREAD_IGNORE_ORIENTATION) == 0 && flags != IMREAD_UNCHANGED )
-     {
-         ApplyExifOrientation(buf, *dst);
-     }
- 
      return *dst;
  }
  

diff --cc modules/stitching/perf/opencl/perf_stitch.cpp
Simple merge

diff --cc modules/stitching/perf/perf_estimators.cpp
Simple merge

diff --cc modules/stitching/perf/perf_matchers.cpp
Simple merge

diff --cc modules/stitching/perf/perf_precomp.hpp
index cb89f16,7359f8f..45997a3
--- 1/modules/stitching/perf/perf_precomp.hpp
--- 2/modules/stitching/perf/perf_precomp.hpp
+++ b/modules/stitching/perf/perf_precomp.hpp
@@@ -11,18 -7,18 +11,18 @@@
  namespace cv
  {
  
 -static inline Ptr<detail::FeaturesFinder> getFeatureFinder(const std::string& name)
 +static inline Ptr<Feature2D> getFeatureFinder(const std::string& name)
  {
      if (name == "orb")
 -        return makePtr<detail::OrbFeaturesFinder>();
 +        return ORB::create();
- #ifdef HAVE_OPENCV_XFEATURES2D
+ #if defined(HAVE_OPENCV_XFEATURES2D) && defined(OPENCV_ENABLE_NONFREE)
      else if (name == "surf")
 -        return makePtr<detail::SurfFeaturesFinder>();
 +        return xfeatures2d::SURF::create();
  #endif
      else if (name == "akaze")
 -        return makePtr<detail::AKAZEFeaturesFinder>();
 +        return AKAZE::create();
      else
 -        return Ptr<detail::FeaturesFinder>();
 +        return Ptr<Feature2D>();
  }
  
  } // namespace cv

diff --cc modules/stitching/perf/perf_stich.cpp
index 24c000d,0708b6e..d8b9697
--- 1/modules/stitching/perf/perf_stich.cpp
--- 2/modules/stitching/perf/perf_stich.cpp
+++ b/modules/stitching/perf/perf_stich.cpp
@@@ -15,9 -15,8 +15,9 @@@ using namespace perf
  typedef TestBaseWithParam<string> stitch;
  typedef TestBaseWithParam<int> stitchExposureCompensation;
  typedef TestBaseWithParam<tuple<string, string> > stitchDatasets;
 +typedef TestBaseWithParam<tuple<string, int>> stitchExposureCompMultiFeed;
  
- #ifdef HAVE_OPENCV_XFEATURES2D
+ #if defined(HAVE_OPENCV_XFEATURES2D) && defined(OPENCV_ENABLE_NONFREE)
  #define TEST_DETECTORS testing::Values("surf", "orb", "akaze")
  #else
  #define TEST_DETECTORS testing::Values("orb", "akaze")

diff --cc platforms/js/build_js.py
Simple merge

diff --cc samples/python/tutorial_code/ImgTrans/distance_transformation/imageSegmentation.py
Simple merge