Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 4 Dec 2020 18:25:32 +0000 (18:25 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 4 Dec 2020 18:26:58 +0000 (18:26 +0000)
commit6fdb7aee844f1e37538fc99716a25ff514a68c07
tree49792a6172a1ec93f915ecea57a95830940e49ec
parent22d64ae08fbf75162e0b6b0ca031be736343d92c
parent12a36b5a94010171f5ca14a3791a2b5bddf58e32
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
20 files changed:
cmake/OpenCVFindLibsGrfmt.cmake
cmake/OpenCVModule.cmake
cmake/OpenCVUtils.cmake
doc/tutorials/videoio/video-write/video_write.markdown
modules/calib3d/include/opencv2/calib3d.hpp
modules/calib3d/test/test_fisheye.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/count_non_zero.dispatch.cpp
modules/core/src/norm.cpp
modules/core/src/system.cpp
modules/imgproc/test/test_drawing.cpp
modules/js/CMakeLists.txt
modules/js/generator/templates.py
modules/js/src/core_bindings.cpp
modules/ts/src/ts.cpp
modules/videoio/src/cap_mjpeg_decoder.cpp
modules/videoio/src/cap_msmf.cpp
modules/videoio/test/test_camera.cpp
modules/videoio/test/test_video_io.cpp
platforms/js/build_js.py