Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 25 Jul 2019 19:21:47 +0000 (19:21 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 25 Jul 2019 19:21:47 +0000 (19:21 +0000)
commit0cf479dd5ce8602040716811240bb7595de4ba9e
tree31949ac8829d17584cffd99195a64ef5cfca2a77
parent1f736a95a776748de17c8db9b85792821d19809b
parent2693ed9b22f44434a8650ade84199a916d04af6f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
12 files changed:
CMakeLists.txt
cmake/OpenCVDetectInferenceEngine.cmake
modules/core/src/ocl.cpp
modules/core/src/system.cpp
modules/dnn/src/op_inf_engine.hpp
modules/dnn/test/test_backends.cpp
modules/dnn/test/test_common.hpp
modules/dnn/test/test_common.impl.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/cascadedetect.hpp
samples/cpp/CMakeLists.txt
samples/dnn/js_face_recognition.html