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

author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Thu, 6 Aug 2020 14:15:52 +0000 (14:15 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Thu, 6 Aug 2020 14:15:52 +0000 (14:15 +0000)
commit	fa25faa2d2a9ebf767e3d198ea0dd9214fe27cfb
tree	fe8ee302ca6a9e40ea3fb5ef2244bf81986121b1	tree \| snapshot
parent	dbab8d8c3897040f134af7195e130dbfcdc2c065	commit \| diff
parent	1067cd064919ead1a36f9133198b94e084698e68	commit \| diff

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

20 files changed:

3rdparty/carotene/hal/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVDetectCUDA.cmake	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/include/opencv2/dnn/all_layers.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/convolution_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/fully_connected_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/permute_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/slice_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/onnx/onnx_importer.cpp	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_misc.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_onnx_importer.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/include/opencv2/features2d.hpp	diff1 \|	diff2 \|	blob \| history
modules/flann/include/opencv2/flann.hpp	diff1 \|	diff2 \|	blob \| history
modules/flann/include/opencv2/flann/hierarchical_clustering_index.h	diff1 \|	diff2 \|	blob \| history
modules/imgcodecs/src/grfmt_jpeg2000.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/include/opencv2/imgproc.hpp	diff1 \|	diff2 \|	blob \| history
modules/stitching/include/opencv2/stitching.hpp	diff1 \|	diff2 \|	blob \| history
modules/stitching/misc/python/test/test_stitching.py	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Vision;

3rdparty/carotene/hal/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVDetectCUDA.cmake	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/include/opencv2/dnn/all_layers.hpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/convolution_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/fully_connected_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/permute_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/slice_layer.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/onnx/onnx_importer.cpp	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_misc.cpp	diff1 \|	diff2 \|	blob \| history
modules/dnn/test/test_onnx_importer.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/include/opencv2/features2d.hpp	diff1 \|	diff2 \|	blob \| history
modules/flann/include/opencv2/flann.hpp	diff1 \|	diff2 \|	blob \| history
modules/flann/include/opencv2/flann/hierarchical_clustering_index.h	diff1 \|	diff2 \|	blob \| history
modules/imgcodecs/src/grfmt_jpeg2000.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/include/opencv2/imgproc.hpp	diff1 \|	diff2 \|	blob \| history
modules/stitching/include/opencv2/stitching.hpp	diff1 \|	diff2 \|	blob \| history
modules/stitching/misc/python/test/test_stitching.py	diff1 \|	diff2 \|	blob \| history