Updated to 0.6.16

2026-08-12 21:21:42 +08:00 · 2015-08-29 22:08:03 +02:00
parent e36469ba60
commit 91c676aba4
4 changed files with 100 additions and 59 deletions
@@ -1,47 +1,62 @@
 GEM
  remote: https://rubygems.org/
  specs:
+    RedCloth (4.2.9)
    RedCloth (4.2.9-x86-mingw32)
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
      json (~> 1.7, >= 1.7.7)
      minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
+    addressable (2.3.8)
    blankslate (2.1.2.4)
    celluloid (0.16.0)
      timers (~> 4.0.0)
-    classifier-reborn (2.0.1)
+    classifier-reborn (2.0.3)
      fast-stemmer (~> 1.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
      coffee-script-source
      execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.1.1)
    colorator (0.1)
-    execjs (2.2.2)
+    ethon (0.7.4)
+      ffi (>= 1.3.0)
+    execjs (2.6.0)
    fast-stemmer (1.0.2)
-    ffi (1.9.6-x86-mingw32)
+    ffi (1.9.10)
+    ffi (1.9.10-x86-mingw32)
    gemoji (2.1.0)
-    github-pages (28)
+    github-pages (39)
      RedCloth (= 4.2.9)
+      github-pages-health-check (~> 0.2)
      jekyll (= 2.4.0)
-      jekyll-coffeescript (= 1.0.0)
-      jekyll-mentions (= 0.1.3)
-      jekyll-redirect-from (= 0.6.2)
-      jekyll-sass-converter (= 1.2.0)
-      jekyll-sitemap (= 0.6.0)
-      jemoji (= 0.3.0)
-      kramdown (= 1.3.1)
-      liquid (= 2.6.1)
+      jekyll-coffeescript (= 1.0.1)
+      jekyll-feed (= 0.3.1)
+      jekyll-mentions (= 0.2.1)
+      jekyll-redirect-from (= 0.8.0)
+      jekyll-sass-converter (= 1.3.0)
+      jekyll-sitemap (= 0.8.1)
+      jemoji (= 0.5.0)
+      kramdown (= 1.5.0)
+      liquid (= 2.6.2)
      maruku (= 0.7.0)
-      pygments.rb (= 0.6.0)
+      mercenary (~> 0.3)
+      pygments.rb (= 0.6.3)
      rdiscount (= 2.1.7)
-      redcarpet (= 3.1.2)
+      redcarpet (= 3.3.2)
+      terminal-table (~> 1.4)
+    github-pages-health-check (0.4.2)
+      addressable (~> 2.3)
+      net-dns (~> 0.8)
+      public_suffix (~> 1.4)
+      typhoeus (~> 0.7)
    hitimes (1.2.2)
+    hitimes (1.2.2-x86-mingw32)
    html-pipeline (1.9.0)
      activesupport (>= 2)
      nokogiri (~> 1.4)
-    i18n (0.6.11)
+    i18n (0.7.0)
    jekyll (2.4.0)
      classifier-reborn (~> 2.0)
      colorator (~> 0.1)
@@ -57,60 +72,69 @@ GEM
      redcarpet (~> 3.1)
      safe_yaml (~> 1.0)
      toml (~> 0.1.0)
-    jekyll-coffeescript (1.0.0)
+    jekyll-coffeescript (1.0.1)
      coffee-script (~> 2.2)
-    jekyll-gist (1.1.0)
-    jekyll-mentions (0.1.3)
+    jekyll-feed (0.3.1)
+    jekyll-gist (1.3.4)
+    jekyll-mentions (0.2.1)
      html-pipeline (~> 1.9.0)
      jekyll (~> 2.0)
    jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.6.2)
-      jekyll (~> 2.0)
-    jekyll-sass-converter (1.2.0)
+    jekyll-redirect-from (0.8.0)
+      jekyll (>= 2.0)
+    jekyll-sass-converter (1.3.0)
      sass (~> 3.2)
-    jekyll-sitemap (0.6.0)
-    jekyll-watch (1.1.1)
+    jekyll-sitemap (0.8.1)
+    jekyll-watch (1.2.1)
      listen (~> 2.7)
-    jemoji (0.3.0)
+    jemoji (0.5.0)
      gemoji (~> 2.0)
      html-pipeline (~> 1.9)
-      jekyll (~> 2.0)
-    json (1.8.1)
-    kramdown (1.3.1)
-    liquid (2.6.1)
-    listen (2.7.11)
-      celluloid (>= 0.15.2)
+      jekyll (>= 2.0)
+    json (1.8.3)
+    kramdown (1.5.0)
+    liquid (2.6.2)
+    listen (2.10.1)
+      celluloid (~> 0.16.0)
      rb-fsevent (>= 0.9.3)
      rb-inotify (>= 0.9)
    maruku (0.7.0)
-    mercenary (0.3.4)
-    mini_portile (0.6.0)
-    minitest (5.4.2)
-    nokogiri (1.6.3.1-x86-mingw32)
-      mini_portile (= 0.6.0)
+    mercenary (0.3.5)
+    mini_portile (0.6.2)
+    minitest (5.8.0)
+    net-dns (0.8.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    nokogiri (1.6.6.2-x86-mingw32)
+      mini_portile (~> 0.6.0)
    parslet (1.5.0)
      blankslate (~> 2.0)
-    posix-spawn (0.3.9)
-    pygments.rb (0.6.0)
+    posix-spawn (0.3.11)
+    public_suffix (1.5.1)
+    pygments.rb (0.6.3)
      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rb-fsevent (0.9.4)
+      yajl-ruby (~> 1.2.0)
+    rb-fsevent (0.9.5)
    rb-inotify (0.9.5)
      ffi (>= 0.5.0)
    rdiscount (2.1.7)
-    redcarpet (3.1.2)
+    redcarpet (3.3.2)
    safe_yaml (1.0.4)
-    sass (3.4.7)
-    thread_safe (0.3.4)
+    sass (3.4.18)
+    terminal-table (1.5.2)
+    thread_safe (0.3.5)
    timers (4.0.1)
      hitimes
    toml (0.1.2)
      parslet (~> 1.5.0)
+    typhoeus (0.7.3)
+      ethon (>= 0.7.4)
    tzinfo (1.2.2)
      thread_safe (~> 0.1)
-    yajl-ruby (1.1.0-x86-mingw32)
+    yajl-ruby (1.2.1)

 PLATFORMS
+  ruby
  x86-mingw32

 DEPENDENCIES
@@ -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;
@@ -7,7 +7,7 @@ showInMenu: true
 quaggaJS
 ========

- [Changelog](#changelog) (2015-08-13)
+- [Changelog](#changelog) (2015-08-29)

 ## What is QuaggaJS?

@@ -40,10 +40,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
@@ -382,6 +382,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-