Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 20 Nov 2021 04:42:58 +0000 (04:42 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 20 Nov 2021 05:13:50 +0000 (05:13 +0000)
commitac4b592b4e550a0ced1977e9aa19e8059a796e3c
treea8be99190d9dcd17a44b2cf6d1936ad2ec545bd9
parentf5de714451a565a0b3bc1b54be68b6a2bbf38074
parent93b6e80cd7484cda36378ea38520953e3049a849
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/imgcodecs/src/loadsave.cpp
modules/js/test/package.json
modules/objdetect/include/opencv2/objdetect.hpp
modules/objdetect/misc/python/pyopencv_objdetect.hpp
modules/objdetect/test/test_qrcode_encode.cpp
modules/videoio/doc/videoio_overview.markdown