Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 28 Jan 2020 10:16:03 +0000 (13:16 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 28 Jan 2020 11:26:57 +0000 (14:26 +0300)
commit560f85f8e51226340e5da4e0fa0047f0920e663e
treed8ffa3f753801ed00f8d9ef89e576b41c62f7405
parentf856c964e23c1349d92a97875f614a6590d6bd6b
parent223790e6fc5fb09d62b10d5616c2902fdc223579
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
23 files changed:
3rdparty/carotene/hal/CMakeLists.txt
CMakeLists.txt
modules/calib3d/src/solvepnp.cpp
modules/core/src/parallel_impl.cpp
modules/dnn/include/opencv2/dnn/all_layers.hpp
modules/dnn/include/opencv2/dnn/version.hpp
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/layers/slice_layer.cpp
modules/dnn/src/layers/softmax_layer.cpp
modules/dnn/src/op_inf_engine.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/imgproc/CMakeLists.txt
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/listconverters.cpp
modules/java/generator/src/cpp/listconverters.hpp
modules/objdetect/include/opencv2/objdetect.hpp
modules/objdetect/src/qrcode.cpp
modules/python/src2/cv2.cpp
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/test/test_ffmpeg.cpp
platforms/android/build_sdk.py