Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 18 May 2021 18:06:26 +0000 (18:06 +0000)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 18 May 2021 18:06:26 +0000 (18:06 +0000)
commit7d66f1e391beea068df4068b5a025080b8bef2be
tree47e1264250a260d058e273f032564b74834186dd
parent6265155ce42de26146c5e9578f6e5518aa78de49
parent1ae16beb06ef8b8dc9ab957c46aa53fe089dc314
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
cmake/OpenCVCompilerOptions.cmake
modules/core/include/opencv2/core/mat.inl.hpp
modules/core/test/test_mat.cpp
modules/imgcodecs/include/opencv2/imgcodecs.hpp
samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp