Merge pull request opencv#9713 from huningxin:fix_9712

alalek · alalek · commit e8ee28471042 · 2017-09-26T09:03:34.000Z
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -189,6 +189,7 @@ if(BUILD_DOCS AND DOXYGEN_FOUND)
   set(haar_cascade_files "")
   set(data_harrcascades_path "${OpenCV_SOURCE_DIR}/data/haarcascades/")
   list(APPEND js_tutorials_assets_deps "${data_harrcascades_path}/haarcascade_frontalface_default.xml" "${data_harrcascades_path}/haarcascade_eye.xml")
+  list(APPEND js_assets "${data_harrcascades_path}/haarcascade_frontalface_default.xml" "${data_harrcascades_path}/haarcascade_eye.xml")
 
   foreach(f ${js_assets})
     get_filename_component(fname "${f}" NAME)
diff --git a/doc/js_tutorials/js_assets/js_face_detection.html b/doc/js_tutorials/js_assets/js_face_detection.html
@@ -77,18 +77,14 @@ <h2>Face Detection Example</h2>
 });
 
 utils.loadOpenCv(() => {
-    tryIt.removeAttribute('disabled');
+    let eyeCascadeFile = 'haarcascade_eye.xml';
+    utils.createFileFromUrl(eyeCascadeFile, eyeCascadeFile, () => {
+        let faceCascadeFile = 'haarcascade_frontalface_default.xml';
+        utils.createFileFromUrl(faceCascadeFile, faceCascadeFile, () => {
+            tryIt.removeAttribute('disabled');
+        });
+    });
 });
-let Module = {
-    preRun: [function() {
-        Module.FS_createPreloadedFile('/', 'haarcascade_eye.xml',
-                                      'haarcascade_eye.xml', true, false);
-        let frontalfaceXML = 'haarcascade_frontalface_default.xml';
-        let frontalfaceDefaultXML = 'haarcascade_frontalface_default.xml';
-        Module.FS_createPreloadedFile('/', frontalfaceXML,
-                                      frontalfaceDefaultXML, true, false);
-    }],
-};
 </script>
 </body>
 </html>
diff --git a/doc/js_tutorials/js_assets/js_face_detection_camera.html b/doc/js_tutorials/js_assets/js_face_detection_camera.html
@@ -131,16 +131,11 @@ <h2>Face Detection Camera Example</h2>
     startAndStop.innerText = 'Start';
 }
 
-let Module = {
-    preRun: [function() {
-        Module.FS_createPreloadedFile(
-            '/', 'haarcascade_frontalface_default.xml',
-            'haarcascade_frontalface_default.xml', true, false);
-    }],
-};
-
 utils.loadOpenCv(() => {
-    startAndStop.removeAttribute('disabled');
+    let faceCascadeFile = 'haarcascade_frontalface_default.xml';
+    utils.createFileFromUrl(faceCascadeFile, faceCascadeFile, () => {
+        startAndStop.removeAttribute('disabled');
+    });
 });
 </script>
 </body>
diff --git a/doc/js_tutorials/js_assets/utils.js b/doc/js_tutorials/js_assets/utils.js
@@ -19,6 +19,24 @@ function Utils(errorOutputId) { // eslint-disable-line no-unused-vars
         node.parentNode.insertBefore(script, node);
     };
 
+    this.createFileFromUrl = function(path, url, callback) {
+        let request = new XMLHttpRequest();
+        request.open('GET', url, true);
+        request.responseType = 'arraybuffer';
+        request.onload = function(ev) {
+            if (request.readyState === 4) {
+                if (request.status === 200) {
+                    let data = new Uint8Array(request.response);
+                    cv.FS_createDataFile('/', path, data, true, false, false);
+                    callback();
+                } else {
+                    self.printError('Failed to load ' + url + ' status: ' + request.status);
+                }
+            }
+        };
+        request.send();
+    };
+
     this.loadImageToCanvas = function(url, cavansId) {
         let canvas = document.getElementById(cavansId);
         let ctx = canvas.getContext('2d');
