Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 1 Apr 2021 01:40:14 +0000 (01:40 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 1 Apr 2021 09:54:57 +0000 (09:54 +0000)
commit3e1673e8b2d5c15b028fb81f7413f5321daa8a2e
treedf025c0ee02d17e0430bab617ecb2298d2f9ae48
parent174753921d38ade0443178ec294134277784e7ed
parent5340dc66861b652bd3c582e992db3056cf5807be
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
14 files changed:
cmake/OpenCVModule.cmake
doc/Doxyfile.in
modules/core/include/opencv2/core/hal/intrin.hpp
modules/core/src/arithm.cpp
modules/core/test/test_arithm.cpp
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/python/src2/cv2.cpp
modules/python/src2/gen2.py
modules/python/src2/hdr_parser.py
modules/videoio/src/cap_avfoundation.mm
modules/videoio/src/cap_avfoundation_mac.mm
modules/videoio/src/cap_mjpeg_encoder.cpp