Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 11 Feb 2022 17:32:37 +0000 (17:32 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 11 Feb 2022 17:32:37 +0000 (17:32 +0000)
commit19926e2979ef049a89dd029e2231555db40c2776
treebcaf19628bc377872f4d045c23d562bb6be2df09
parent76aff8478883858f0e46746044348ebb16dc3c67
parent1620a1e0147ea98cf4fd4fa8bb8ba7d7bc45da42
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
40 files changed:
cmake/OpenCVDetectInferenceEngine.cmake
modules/core/include/opencv2/core/persistence.hpp
modules/dnn/CMakeLists.txt
modules/dnn/include/opencv2/dnn/dnn.hpp
modules/dnn/include/opencv2/dnn/utils/inference_engine.hpp
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/batch_norm_layer.cpp
modules/dnn/src/layers/blank_layer.cpp
modules/dnn/src/layers/concat_layer.cpp
modules/dnn/src/layers/const_layer.cpp
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/layers/detection_output_layer.cpp
modules/dnn/src/layers/elementwise_layers.cpp
modules/dnn/src/layers/eltwise_layer.cpp
modules/dnn/src/layers/flatten_layer.cpp
modules/dnn/src/layers/fully_connected_layer.cpp
modules/dnn/src/layers/lrn_layer.cpp
modules/dnn/src/layers/mvn_layer.cpp
modules/dnn/src/layers/normalize_bbox_layer.cpp
modules/dnn/src/layers/not_implemented_layer.cpp
modules/dnn/src/layers/padding_layer.cpp
modules/dnn/src/layers/permute_layer.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/layers/prior_box_layer.cpp
modules/dnn/src/layers/proposal_layer.cpp
modules/dnn/src/layers/reorg_layer.cpp
modules/dnn/src/layers/reshape_layer.cpp
modules/dnn/src/layers/resize_layer.cpp
modules/dnn/src/layers/scale_layer.cpp
modules/dnn/src/layers/slice_layer.cpp
modules/dnn/src/layers/softmax_layer.cpp
modules/dnn/src/op_inf_engine.cpp
modules/dnn/src/op_inf_engine.hpp
modules/dnn/test/test_common.impl.hpp
modules/dnn/test/test_ie_models.cpp
modules/dnn/test/test_layers.cpp
modules/dnn/test/test_misc.cpp
modules/imgproc/include/opencv2/imgproc.hpp
platforms/winpack_dldt/build_package.py
samples/dnn/text_detection.py