Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 20 Nov 2020 19:35:32 +0000 (19:35 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 20 Nov 2020 20:32:00 +0000 (20:32 +0000)
commit0105f8fa38ec867a8e4bbc74c402afcd0e296194
treed43f4abccb64d672fd6e53cdf071c28ce1b0db81
parent049b50d9c0dfb5d06d7528ea334cf42c7bc435f6
parent2255973b0f38591550ae08ed71dbc9056f317b96
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.markdown
modules/calib3d/doc/calib3d.bib
modules/calib3d/include/opencv2/calib3d.hpp
modules/calib3d/src/solvepnp.cpp
modules/calib3d/src/sqpnp.cpp
modules/core/include/opencv2/core.hpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/highgui/include/opencv2/highgui.hpp
modules/imgcodecs/include/opencv2/imgcodecs.hpp