Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 5 Oct 2019 15:45:31 +0000 (15:45 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 5 Oct 2019 15:45:31 +0000 (15:45 +0000)
1  2 
cmake/OpenCVDetectInferenceEngine.cmake
modules/core/include/opencv2/core/cvdef.h
modules/core/src/system.cpp
modules/dnn/misc/python/test/test_dnn.py
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/op_inf_engine.hpp
modules/dnn/test/test_common.hpp
modules/dnn/test/test_common.impl.hpp
modules/imgproc/misc/java/test/ImgprocTest.java
modules/imgproc/test/test_convhull.cpp
modules/objdetect/src/qrcode.cpp

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge