Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 28 Aug 2021 21:30:28 +0000 (21:30 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 28 Aug 2021 21:30:28 +0000 (21:30 +0000)
commit4c05a697fa201d88537e2306b94b9106ade8edb9
tree45affd847acb88bd8f8c407d398f8f808d1a023f
parent56d0d5986f8f982b550e2ad5eb991fe7be1ccb5e
parent1259a474ba1a2f87a1157f28e7a4dd33aec6dde7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/src/matrix.cpp
modules/core/src/ocl.cpp
modules/core/src/umatrix.cpp
modules/dnn/src/caffe/caffe_importer.cpp
modules/video/test/test_trackers.impl.hpp