Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 23 May 2022 14:58:45 +0000 (14:58 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 23 May 2022 16:06:14 +0000 (16:06 +0000)
commitd9bf522b271ed026813cbe35399b5aead3c9b670
treed4f5b3b43a707865243791afe9395adaf15d5b2f
parent7e845a3b87e9e729e6f10b049b2845331f966a6a
parent93dc0679ec93fe6a152f4f1c238da9cdc6aa00ed
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
3rdparty/libpng/CMakeLists.txt
3rdparty/libtiff/CMakeLists.txt
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_int8_layers.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/ts/src/ts_gtest.cpp
modules/video/src/tracking/tracker_dasiamrpn.cpp