Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Fri, 21 Jun 2019 14:27:14 +0000 (17:27 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Fri, 21 Jun 2019 14:27:14 +0000 (17:27 +0300)
commitf33f88de3138366bc370f5d49d08d351179b910d
tree940a549b3a10bec5eea43ca91193f1e472aee94f
parente69ff713021622eee1fa13fa095c0c338669d0ab
parent4b205680dfc9c49c696f2022e05944b409c3c9d8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/calib3d/src/calibration.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/videoio/src/cap_mfx_writer.cpp
samples/dnn/js_face_recognition.html