Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 10 Jun 2019 19:03:53 +0000 (19:03 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 10 Jun 2019 19:05:28 +0000 (19:05 +0000)
commit11b020b9f9e111bddd40bffe3b1759aa02d966f0
tree8517b0d0fd5c9ca1997acc2ab30af8419c8330e2
parent987061d800609ba8e4cff893fb6502bc6a4750c4
parent878af7ada86efc3eb7bcc5eb011549a834455b90
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
20 files changed:
CMakeLists.txt
cmake/OpenCVFindLibsGrfmt.cmake
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/hal/intrin_cpp.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/matrix_wrap.cpp
modules/core/src/parallel.cpp
modules/dnn/include/opencv2/dnn/dnn.hpp
modules/dnn/src/dnn.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/op_inf_engine.cpp
modules/dnn/src/op_inf_engine.hpp
modules/dnn/test/test_misc.cpp
modules/features2d/src/fast.cpp
modules/imgcodecs/src/utils.cpp
modules/imgcodecs/test/test_grfmt.cpp
modules/imgproc/src/canny.cpp
modules/imgproc/src/corner.cpp
modules/imgproc/src/imgwarp.cpp
modules/video/src/lkpyramid.cpp