projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5620306)
Fix face recognition JS sample
authorDmitry Kurtaev <dmitry.kurtaev+github@gmail.com>
Mon, 24 Jun 2019 13:41:37 +0000 (16:41 +0300)
committerDmitry Kurtaev <dmitry.kurtaev+github@gmail.com>
Mon, 24 Jun 2019 13:41:37 +0000 (16:41 +0300)
samples/dnn/js_face_recognition.html patch | blob | history

diff --git a/samples/dnn/js_face_recognition.html b/samples/dnn/js_face_recognition.html
index 78141e1..27b74c9 100644 (file)
--- a/samples/dnn/js_face_recognition.html
+++ b/samples/dnn/js_face_recognition.html
@@ -3,12 +3,12 @@
 <html>
 
 <head>
-  <script src="utils.js" type="text/javascript"></script>
+  <script async src="../../opencv.js" type="text/javascript"></script>
+  <script src="../../utils.js" type="text/javascript"></script>
 
 <script type='text/javascript'>
 var netDet = undefined, netRecogn = undefined;
 var persons = {};
-var utils = new Utils('');
 
 //! [Run face detection model]
 function detectFaces(img) {
@@ -68,6 +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 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';
@@ -187,7 +188,7 @@ function main() {
 };
 
 // Load opencv.js
-utils.loadOpenCv(() => {
+cv['onRuntimeInitialized']=()=>{
   main();
 });
 </script>
Domain: Multimedia / Media Vision;