Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 13 Mar 2021 13:02:18 +0000 (13:02 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 13 Mar 2021 13:02:18 +0000 (13:02 +0000)
commitb19f8603843ac63274379c9e36331db6d4917001
tree97f5b9fa324f44682edbe88fa0cdd2c10460f528
parent4c1d5840bbe6030c7fb8d2532429771f4d7c5cf0
parent960f501cc18bed647c3718c4d62fc94a4819ab1c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
doc/js_tutorials/js_setup/js_setup/js_setup.markdown
modules/calib3d/src/solvepnp.cpp
modules/core/src/system.cpp
modules/core/test/ocl/test_opencl.cpp
modules/dnn/src/layers/detection_output_layer.cpp
modules/dnn/src/layers/mvn_layer.cpp
modules/dnn/src/layers/resize_layer.cpp
platforms/js/build_js.py
platforms/js/opencv_js.config.py
samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp
samples/dnn/virtual_try_on.py