Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 25 Sep 2021 17:50:00 +0000 (17:50 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 25 Sep 2021 17:50:00 +0000 (17:50 +0000)
commit24fcb7f8131f707717a9f1871b17d95e7cf519ee
tree0922d64042a869900db87e9c8591c79dfb7c2c6b
parent9e835e8edb62b42ca53d887be4c124fed142dfcd
parent236c64a17d4c9e1eac3fb25044bdfeceba1d7463
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
12 files changed:
3rdparty/openvx/hal/openvx_hal.cpp
3rdparty/openvx/hal/openvx_hal.hpp
cmake/OpenCVDetectInferenceEngine.cmake
modules/core/src/system.cpp
modules/dnn/src/layers/region_layer.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_darknet_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/imgproc/include/opencv2/imgproc/hal/hal.hpp
modules/imgproc/src/hal_replacement.hpp
modules/photo/src/inpaint.cpp
samples/dnn/text_detection.py