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

projects / platform / upstream / opencv.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4188e8a dd69606)

author	Alexander Alekhin <alexander.alekhin@intel.com>
	Tue, 26 Feb 2019 11:49:37 +0000 (14:49 +0300)
committer	Alexander Alekhin <alexander.alekhin@intel.com>
	Tue, 26 Feb 2019 14:34:42 +0000 (17:34 +0300)
commit	c3cf35ab63c04fb1d7b2f6760128f42c20cac0e1
tree	5dd2feecc3753a688f15b2faea91f9c729b78192	tree \| snapshot
parent	4188e8aaf99dbc3b33537b54154d1480f8f5b693	commit \| diff
parent	dd696066b5ca8b5aa434bc6eee38087779026d4d	commit \| diff

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

19 files changed:

cmake/OpenCVCompilerOptions.cmake	diff1 \|	diff2 \|	blob \| history
modules/core/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/core/src/cuda_host_mem.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/mean.dispatch.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/merge.dispatch.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/split.dispatch.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/convolution_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/detection_output_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/lrn_layer.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/src/op_inf_engine.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_backends.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_common.hpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/window_cocoa.mm	diff1 \|	diff2 \|	blob \| history
modules/imgproc/test/test_filter.cpp	diff1 \|	diff2 \|	blob \| history
modules/python/src2/cv2.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/include/opencv2/video/tracking.hpp	diff1 \|	diff2 \|	blob \| history
modules/videoio/src/cap_v4l.cpp	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Vision;