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)
1  2 
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

Simple merge
@@@ -68,8 -68,7 +68,7 @@@ function recognize(face) 
  //! [Recognize]
  
  function loadModels(callback) {
-   var utils = new Utils('');
 -  var proto = 'https://raw.githubusercontent.com/opencv/opencv/3.4/samples/dnn/face_detector/deploy.prototxt';
 +  var proto = 'https://raw.githubusercontent.com/opencv/opencv/master/samples/dnn/face_detector/deploy.prototxt';
    var weights = 'https://raw.githubusercontent.com/opencv/opencv_3rdparty/dnn_samples_face_detector_20180205_fp16/res10_300x300_ssd_iter_140000_fp16.caffemodel';
    var recognModel = 'https://raw.githubusercontent.com/pyannote/pyannote-data/master/openface.nn4.small2.v1.t7';
    utils.createFileFromUrl('face_detector.prototxt', proto, () => {