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

projects / platform / upstream / opencv.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5ecf5f1 322960f)

author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Mon, 18 May 2020 17:50:16 +0000 (17:50 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Mon, 18 May 2020 17:50:16 +0000 (17:50 +0000)
commit	593af7287b62260837f53513c5b462552e34eb3a
tree	1acfeaea1effaebb3a4ce1543d1124a2e96bf44d	tree \| snapshot
parent	5ecf5f106aeeb603cd83640a79357820fce25eaf	commit \| diff
parent	322960f79505d2a6917ae9eb9a68ff5d4af5eaca	commit \| diff

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

15 files changed:

modules/core/include/opencv2/core/private.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/batch_norm_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/resize_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/scale_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/tensorflow/tf_importer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_common.impl.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_darknet_importer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_layers.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_onnx_importer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_tf_importer.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgcodecs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/imgproc/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/videoio/src/cap_avfoundation.mm	diff1 \|	diff2 \|	blob \| history
samples/_winpack_build_sample.cmd	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Vision;