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

projects / platform / upstream / opencv.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8b3042d 3019927)

author	Alexander Alekhin <alexander.alekhin@intel.com>
	Wed, 22 Jan 2020 13:58:30 +0000 (16:58 +0300)
committer	Alexander Alekhin <alexander.alekhin@intel.com>
	Wed, 22 Jan 2020 13:58:30 +0000 (16:58 +0300)
commit	3d14dd4e3953aa7b7e2ab3a388ca7bf08fe99d99
tree	e1f86271aee8ddd7924ae4b83a586a869a0fdaf5	tree \| snapshot
parent	8b3042da63f4d0f112a1ec2199ebffc2894f567d	commit \| diff
parent	3019927a6134869cbfc8fcdce0d15c834871c06e	commit \| diff

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

14 files changed:

3rdparty/carotene/hal/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVCompilerOptions.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVUtils.cmake	diff1 \|	diff2 \|	blob \| history
modules/dnn/include/opencv2/dnn/dnn.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/misc/java/src/cpp/dnn_converters.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/misc/python/test/test_dnn.py	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/dnn.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/lrn_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/onnx/onnx_graph_simplifier.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/onnx/onnx_importer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/op_inf_engine.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_darknet_importer.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgcodecs/src/loadsave.cpp	diff1 \|	diff2 \|	blob \| history
modules/ts/src/ts.cpp	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Vision;