Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Thu, 20 Feb 2020 16:45:21 +0000 (19:45 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Thu, 20 Feb 2020 16:47:27 +0000 (19:47 +0300)
commit96b26dc8f485026ec432eb69bb5730dfbd71e014
tree4086d92442a07e9d9c563ea634fa82e22b7499d9
parent1f695c4532537ccd55fbc2bd3e0737fe84edf651
parent150c29356a7bedf38b3349b9d46f58175e09a164
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
14 files changed:
apps/interactive-calibration/frameProcessor.cpp
modules/calib3d/src/fundam.cpp
modules/core/src/persistence_yml.cpp
modules/dnn/src/caffe/caffe_importer.cpp
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/crop_and_resize_layer.cpp
modules/dnn/src/layers/resize_layer.cpp
modules/dnn/src/layers/scale_layer.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_ie_models.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/highgui/src/window_cocoa.mm
modules/imgproc/test/test_imgwarp.cpp