review.tizen.org Git - platform/upstream/opencv.git/commit

projects / platform / upstream / opencv.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 94f00cf bdd2b57)

author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Mon, 22 Mar 2021 12:05:23 +0000 (12:05 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Mon, 22 Mar 2021 12:05:23 +0000 (12:05 +0000)
commit	ca8c3dd9b5ab7e94dbe9690f5abd6b711446d776
tree	bbd46e5737828532be6d923803cd6499414db79f	tree \| snapshot
parent	94f00cf09694c38407cce23ed9fea288ab622b0f	commit \| diff
parent	bdd2b57e5dc765de900f8a3325fc590bfb9b4b87	commit \| diff

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

16 files changed:

modules/core/include/opencv2/core/bindings_utils.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/include/opencv2/dnn/utils/inference_engine.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/dnn.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/convolution_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/elementwise_layers.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/normalize_bbox_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/padding_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/permute_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/pooling_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/region_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/op_inf_engine.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/op_inf_engine.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_common.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_onnx_importer.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/include/opencv2/features2d.hpp	diff1 \|	diff2 \|	blob \| history
platforms/js/opencv_js.config.py	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Vision;