reuse Analyzer.decodeCallback for fix schmich#74

hsinlive · Oct 16, 2019 · 7e4d2d6 · 7e4d2d6
1 parent b0f9519
commit 7e4d2d6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
   - '6'
 install: npm install
-script: gulp release
+script: npx gulp release
 env:
   global:
     - COMMIT_AUTHOR_NAME: "'Chris Schmich'"

diff --git a/src/scanner.js b/src/scanner.js
@@ -95,15 +95,16 @@ class Analyzer {
     this.canvas = document.createElement('canvas');
     this.canvas.style.display = 'none';
     this.canvasContext = null;
-
-    this.decodeCallback = ZXing.Runtime.addFunction(function (ptr, len, resultIndex, resultCount) {
-      let result = new Uint8Array(ZXing.HEAPU8.buffer, ptr, len);
-      let str = String.fromCharCode.apply(null, result);
-      if (resultIndex === 0) {
-        window.zxDecodeResult = '';
-      }
-      window.zxDecodeResult += str;
-    });
+    if (!Analyzer.decodeCallback) {
+      Analyzer.decodeCallback = ZXing.Runtime.addFunction(function (ptr, len, resultIndex, resultCount) {
+        let result = new Uint8Array(ZXing.HEAPU8.buffer, ptr, len);
+        let str = String.fromCharCode.apply(null, result);
+        if (resultIndex === 0) {
+          window.zxDecodeResult = '';
+        }
+        window.zxDecodeResult += str;
+      });
+    }
   }
 
   analyze() {
@@ -142,7 +143,7 @@ class Analyzer {
       ZXing.HEAPU8[this.imageBuffer + j] = Math.trunc((r + g + b) / 3);
     }
 
-    let err = ZXing._decode_qr(this.decodeCallback);
+    let err = ZXing._decode_qr(Analyzer.decodeCallback);
     if (err) {
       return null;
     }