Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Fri, 7 Sep 2018 09:40:27 +0000 (12:40 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Fri, 7 Sep 2018 09:40:27 +0000 (12:40 +0300)
20 files changed:
1  2 
modules/core/include/opencv2/core/cvdef.h
modules/core/src/arithm.cpp
modules/core/src/persistence_cpp.cpp
modules/core/test/test_mat.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/pooling_layer.cpp
modules/dnn/src/layers/recurrent_layers.cpp
modules/highgui/src/window.cpp
modules/imgcodecs/src/loadsave.cpp
modules/imgproc/src/drawing.cpp
modules/imgproc/src/featureselect.cpp
modules/imgproc/src/pyramids.cpp
modules/objdetect/src/cascadedetect.cpp
modules/video/src/compat_video.cpp
modules/videoio/src/cap_openni2.cpp
modules/videoio/src/cap_v4l.cpp
modules/videoio/src/videoio_registry.cpp

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge