Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 17 Nov 2020 21:56:26 +0000 (21:56 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 17 Nov 2020 21:56:26 +0000 (21:56 +0000)
commitce8027c6fbce287e610079d681f4f79f254fd408
tree2f8d7855ec31a38144c37268bc20abe8f8884fe2
parent9acbfc6e0549327ddf62eaadd1b11c5ec8e27f00
parent301c078d19c1c101fa3de466d2da0bed664e6b3a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
12 files changed:
doc/tutorials/videoio/video-input-psnr-ssim/video_input_psnr_ssim.markdown
modules/core/include/opencv2/core/cv_cpu_dispatch.h
modules/core/include/opencv2/core/cvdef.h
modules/core/src/convert.simd.hpp
modules/dnn/include/opencv2/dnn/dnn.hpp
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/layers/reshape_layer.cpp
modules/dnn/src/layers/slice_layer.cpp
modules/dnn/src/onnx/onnx_graph_simplifier.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp