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

author	Alexander Alekhin <alexander.alekhin@intel.com>
	Tue, 4 Sep 2018 16:35:38 +0000 (19:35 +0300)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Tue, 4 Sep 2018 18:39:03 +0000 (18:39 +0000)
commit	d74b98c3d9264f9623b27a8d4e0fc92ac97b71d0
tree	a6f0193c6ce03ee72d4db22302ec95584730a715	tree \| snapshot
parent	e0bfe44cacc776310fadcb5cf3e0ef053c319fa5	commit \| diff
parent	351ee2e3a5c5d6908698d0f2fcbeac67c0b6263d	commit \| diff

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

21 files changed:

cmake/OpenCVFindLibsPerf.cmake	diff1 \|	diff2 \|	blob \| history
cmake/templates/cvconfig.h.in	diff1 \|	diff2 \|	blob \| history
doc/Doxyfile.in	diff1 \|	diff2 \|	blob \| history
doc/tutorials/core/how_to_use_OpenCV_parallel_for_/how_to_use_OpenCV_parallel_for_.markdown	diff1 \|	diff2 \|	blob \| history
doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.markdown	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/mat.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/mat.inl.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/arithm.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/count_non_zero.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/norm.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_mat.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/include/opencv2/dnn/dnn.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/dnn.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/tensorflow/tf_graph_simplifier.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/tensorflow/tf_importer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_common.hpp	diff1 \|	diff2 \|	blob \| history
modules/imgcodecs/src/loadsave.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/smooth.cpp	diff1 \|	diff2 \|	blob \| history
modules/js/src/embindgen.py	diff1 \|	diff2 \|	blob \| history
modules/videoio/src/cap_v4l.cpp	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Vision;

cmake/OpenCVFindLibsPerf.cmake	diff1 \|	diff2 \|	blob \| history
cmake/templates/cvconfig.h.in	diff1 \|	diff2 \|	blob \| history
doc/Doxyfile.in	diff1 \|	diff2 \|	blob \| history
doc/tutorials/core/how_to_use_OpenCV_parallel_for_/how_to_use_OpenCV_parallel_for_.markdown	diff1 \|	diff2 \|	blob \| history
doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.markdown	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/mat.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/mat.inl.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/arithm.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/count_non_zero.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/norm.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_mat.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/include/opencv2/dnn/dnn.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/dnn.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/tensorflow/tf_graph_simplifier.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/tensorflow/tf_importer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_common.hpp	diff1 \|	diff2 \|	blob \| history
modules/imgcodecs/src/loadsave.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/smooth.cpp	diff1 \|	diff2 \|	blob \| history
modules/js/src/embindgen.py	diff1 \|	diff2 \|	blob \| history
modules/videoio/src/cap_v4l.cpp	diff1 \|	diff2 \|	blob \| history