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

projects / platform / upstream / opencv.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bc036e1 4f288a1)

author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Wed, 4 Mar 2020 20:49:09 +0000 (20:49 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Wed, 4 Mar 2020 20:49:09 +0000 (20:49 +0000)
commit	d4a17da7b23dd4870fd24374ccc27d9d1fee2e7f
tree	51f43f98b803975f1fdfdf8080a58548ee45f629	tree \| snapshot
parent	bc036e1e86833fcb2a01f3fa4385a80b0bce6d12	commit \| diff
parent	4f288a1e2850fc41c7220ce099c9214ca114c45f	commit \| diff

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

17 files changed:

modules/core/include/opencv2/core/utils/logger.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/logger.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_mat.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/onnx/onnx_graph_simplifier.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/onnx/onnx_graph_simplifier.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/onnx/onnx_importer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_onnx_importer.cpp	diff1 \|	diff2 \|	blob \| history
modules/python/src2/hdr_parser.py	diff1 \|	diff2 \|	blob \| history
modules/python/test/test_umat.py	diff1 \|	diff2 \|	blob \| history
modules/videoio/src/cap_msmf.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/calibration.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/detect_blob.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/detect_mser.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/facial_features.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/matchmethod_orb_akaze_brisk.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/stitching_detailed.cpp	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Vision;