Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 6 Feb 2021 00:43:06 +0000 (00:43 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 6 Feb 2021 00:44:11 +0000 (00:44 +0000)
commit6b474c4051bc5f728ca43c19fd5a8b4d7e44113c
tree6130d2bd1baa63186fb86cde155359adf7ed9770
parenta9c954e8219637f4c5a8b82b68ffcebb89b44852
parent0be18f5cb0aa6e45febde51ea7c8af253d03f144
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
20 files changed:
modules/dnn/include/opencv2/dnn/shape_utils.hpp
modules/dnn/include/opencv2/dnn/version.hpp
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/concat_layer.cpp
modules/dnn/src/layers/flatten_layer.cpp
modules/dnn/src/layers/fully_connected_layer.cpp
modules/dnn/src/layers/normalize_bbox_layer.cpp
modules/dnn/src/layers/reshape_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/onnx/onnx_graph_simplifier.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/objdetect/src/qrcode.cpp
modules/python/src2/cv2.cpp
modules/python/test/test_misc.py
modules/stitching/test/test_matchers.cpp