Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 30 Oct 2021 14:26:17 +0000 (14:26 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 30 Oct 2021 14:26:17 +0000 (14:26 +0000)
commit7b57df02a70b7ed285dd93d48a1e0b9a665e130c
tree04c84944e67bd0668875901c5ffcd35779f93812
parentb65ae3b0363bc936e9b669b486c8767e801c08ce
parentbce76a7977e4fe23789b97b6ab48364d911c71e0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
CMakeLists.txt
cmake/OpenCVCompilerOptimizations.cmake
modules/core/include/opencv2/core/cvdef.h
modules/features2d/src/hal_replacement.hpp
modules/imgproc/src/hal_replacement.hpp