Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 11 Dec 2020 19:27:20 +0000 (19:27 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 11 Dec 2020 19:27:20 +0000 (19:27 +0000)
commitdd1494eebf205b0262c362bbdc57cef212464d1d
tree9e3421101f0cbacb07e0c1582b21f048f1bbd3eb
parent5bb45baa6c407427bf55fd120321b09949bc6ac1
parent1bfc75ac2337620af59c573339b159886b926057
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
14 files changed:
modules/calib3d/include/opencv2/calib3d.hpp
modules/calib3d/src/calibinit.cpp
modules/calib3d/src/circlesgrid.cpp
modules/calib3d/test/test_chesscorners.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/layers/resize_layer.cpp
modules/dnn/test/test_backends.cpp
modules/dnn/test/test_tf_importer.cpp
modules/features2d/src/orb.cpp
modules/features2d/test/test_orb.cpp
modules/imgproc/misc/java/test/ImgprocTest.java
modules/imgproc/test/test_convhull.cpp
modules/videoio/src/cap_gstreamer.cpp
samples/dnn/README.md