Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 15 Oct 2018 20:15:42 +0000 (20:15 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 15 Oct 2018 20:15:42 +0000 (20:15 +0000)
commitedacd91a274757d94be71dc78aaf24026125ae0b
tree9a9f47bec78a32fd96b9db7c91af43edc7c7fdc3
parent5dd46b54c10b4d18041598eb0f96d062cc8420fe
parent24ced3d657f1de9fae8ba82a29d9b360b2735cd9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
13 files changed:
modules/dnn/src/caffe/caffe_importer.cpp
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/imgproc/src/drawing.cpp
modules/imgproc/src/imgwarp.cpp
modules/imgproc/src/pyramids.cpp
modules/imgproc/src/smooth.cpp
modules/js/CMakeLists.txt
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/detection_based_tracker.cpp
modules/video/src/lkpyramid.cpp
modules/videoio/src/cap_v4l.cpp
platforms/js/build_js.py