Merge pull request #62 from serratus/issue-53

Adding support for IE

Author: serratus

README.md

@@ -1,7 +1,7 @@
 quaggaJS
 ========
 
-- [Changelog](#changelog) (2015-08-13)
+- [Changelog](#changelog) (2015-08-29)
 
 ## What is QuaggaJS?
 
@@ -34,10 +34,10 @@ be aligned with the viewport.
 
 In order to take full advantage of quaggaJS, the browser needs to support the
 `getUserMedia` API which is already implemented in recent versions of Firefox,
-Chrome and Opera. The API is also available on their mobile counterparts
-installed on Android. Safari and IE do not allow the access to the camera yet,
-neither on desktop, nor on mobile. You can check [caniuse][caniuse_getusermedia]
-for updates.
+Chrome, IE (Edge) and Opera. The API is also available on their mobile 
+counterparts installed on Android (except IE). Safari does not allow the access
+to the camera yet, neither on desktop, nor on mobile. You can check 
+[caniuse][caniuse_getusermedia] for updates.
 
 In cases where real-time decoding is not needed, or the platform does not
 support `getUserMedia` QuaggaJS is also capable of decoding image-files using
@@ -377,6 +377,10 @@ on the ``singleChannel`` flag in the configuration when using ``decodeSingle``.
 
 ## <a name="changelog">Changelog</a>
 
+### 2015-08-29
+- Improvements
+  - Added support for Internet Explorer (only Edge+ supports `getUserMedia`)
+
 ### 2015-08-13
 - Improvements
   - Added `offProcessed` and `offDetected` methods for detaching event-

dist/quagga.js

@@ -835,7 +835,15 @@ if (typeof window !== 'undefined') {
     navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
     window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
 }
-
+Math.imul = Math.imul || function(a, b) {
+    var ah = (a >>> 16) & 0xffff,
+        al = a & 0xffff,
+        bh = (b >>> 16) & 0xffff,
+        bl = b & 0xffff;
+    // the shift by 0 fixes the sign on the high part
+    // the final |0 converts the unsigned value into a signed value
+    return ((al * bl) + (((ah * bl + al * bh) << 16) >>> 0)|0);
+};
 define("typedefs", (function (global) {
     return function () {
         var ret, fn;
@@ -9084,10 +9092,10 @@ function(InputStream,
 
         blobURL = generateWorkerBlob();
         workerThread.worker = new Worker(blobURL);
-        URL.revokeObjectURL(blobURL);
 
         workerThread.worker.onmessage = function(e) {
             if (e.data.event === 'initialized') {
+                URL.revokeObjectURL(blobURL);
                 workerThread.busy = false;
                 workerThread.imageData = new Uint8Array(e.data.imageData);
                 console.log("Worker initialized");
@@ -9096,6 +9104,8 @@ function(InputStream,
                 workerThread.imageData = new Uint8Array(e.data.imageData);
                 workerThread.busy = false;
                 publishResult(e.data.result, workerThread.imageData);
+            } else if (e.data.event === 'error') {
+                console.log("Worker error: " + e.data.message);
             }
         };
 
@@ -9110,10 +9120,13 @@ function(InputStream,
 
     function workerInterface(factory) {
         if (factory) {
+            /* jshint ignore:start */
             var Quagga = factory();
             if (!Quagga) {
+                self.postMessage({'event': 'error', message: 'Quagga could not be created'});
                 return;
             }
+            /* jshint ignore:end */
         }
         /* jshint ignore:start */
         var imageWrapper;

dist/quagga.min.js

@@ -1,6 +1,6 @@
 {
   "name": "quagga",
-  "version": "0.6.15",
+  "version": "0.6.16",
   "description": "An advanced barcode-scanner written in JavaScript",
   "main": "dist/quagga.js",
   "devDependencies": {

package.json

@@ -332,10 +332,10 @@ function(InputStream,
 
         blobURL = generateWorkerBlob();
         workerThread.worker = new Worker(blobURL);
-        URL.revokeObjectURL(blobURL);
 
         workerThread.worker.onmessage = function(e) {
             if (e.data.event === 'initialized') {
+                URL.revokeObjectURL(blobURL);
                 workerThread.busy = false;
                 workerThread.imageData = new Uint8Array(e.data.imageData);
                 console.log("Worker initialized");
@@ -344,6 +344,8 @@ function(InputStream,
                 workerThread.imageData = new Uint8Array(e.data.imageData);
                 workerThread.busy = false;
                 publishResult(e.data.result, workerThread.imageData);
+            } else if (e.data.event === 'error') {
+                console.log("Worker error: " + e.data.message);
             }
         };
 
@@ -358,10 +360,13 @@ function(InputStream,
 
     function workerInterface(factory) {
         if (factory) {
+            /* jshint ignore:start */
             var Quagga = factory();
             if (!Quagga) {
+                self.postMessage({'event': 'error', message: 'Quagga could not be created'});
                 return;
             }
+            /* jshint ignore:end */
         }
         /* jshint ignore:start */
         var imageWrapper;

src/quagga.js

@@ -19,3 +19,12 @@ if (typeof window !== 'undefined') {
     navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
     window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
 }
+Math.imul = Math.imul || function(a, b) {
+    var ah = (a >>> 16) & 0xffff,
+        al = a & 0xffff,
+        bh = (b >>> 16) & 0xffff,
+        bl = b & 0xffff;
+    // the shift by 0 fixes the sign on the high part
+    // the final |0 converts the unsigned value into a signed value
+    return ((al * bl) + (((ah * bl + al * bh) << 16) >>> 0)|0);
+};