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

diff --cc cmake/OpenCVCompilerOptions.cmake
Simple merge

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

diff --cc modules/core/test/test_mat.cpp
Simple merge

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

diff --cc samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp
index 95eeec07e9e34fd4b0955960ddafaf0d83862fce,5870e456fbd25996f9d7c3760a397a7ff3a235e9..b57ea65b35eed026857aa161887cff9ca825e6fe
--- 1/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp
--- 2/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp
+++ b/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp
@@@ -36,10 -43,9 +36,10 @@@ public
  
                    << "Write_DetectedFeaturePoints" << writePoints
                    << "Write_extrinsicParameters"   << writeExtrinsics
 +                  << "Write_gridPoints" << writeGrid
                    << "Write_outputFileName"  << outputFileName
  
-                   << "Show_UndistortedImage" << showUndistorsed
+                   << "Show_UndistortedImage" << showUndistorted
  
                    << "Input_FlipAroundHorizontalAxis" << flipVertical
                    << "Input_Delay" << delay
@@@ -401,10 -374,10 +401,10 @@@ int main(int argc, char* argv[]
  
          if( mode == CAPTURING )
          {
-             if(s.showUndistorsed)
+             if(s.showUndistorted)
                  msg = cv::format( "%d/%d Undist", (int)imagePoints.size(), s.nrFrames );
              else
 -                msg = format( "%d/%d", (int)imagePoints.size(), s.nrFrames );
 +                msg = cv::format( "%d/%d", (int)imagePoints.size(), s.nrFrames );
          }
  
          putText( view, msg, textOrigin, 1, 1, mode == CALIBRATED ?  GREEN : RED);