Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Fri, 28 Sep 2018 09:48:51 +0000 (12:48 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Fri, 28 Sep 2018 11:14:47 +0000 (14:14 +0300)
commita8b0db4e5dd7606fa0da3094088d1656e6fdf1c0
tree8f5925de11d84b440f24a28b2852a7e5ef736aba
parent29e88e50ffaa8393eacd8343f09fbf2388535161
parent4b895a4d1f5bcd0aa015d50f5c281b2238b86b89
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
22 files changed:
modules/core/include/opencv2/core/opengl.hpp
modules/core/include/opencv2/core/private.hpp
modules/core/src/ocl.cpp
modules/core/src/opengl.cpp
modules/core/src/system.cpp
modules/dnn/include/opencv2/dnn/dnn.hpp
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/detection_output_layer.cpp
modules/dnn/src/layers/eltwise_layer.cpp
modules/dnn/src/layers/permute_layer.cpp
modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp
modules/dnn/test/test_common.hpp
modules/js/CMakeLists.txt
modules/objdetect/src/hog.cpp
modules/videoio/include/opencv2/videoio.hpp
modules/videoio/src/cap.cpp
modules/videoio/src/cap_avfoundation.mm
modules/videoio/src/cap_avfoundation_mac.mm
modules/videoio/src/cap_v4l.cpp
platforms/js/build_js.py