Skip to content

reuse Analyzer.decodeCallback for fix #74 #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hsinlive wants to merge 1 commit into
base: master
Choose a base branch
from
Open

reuse Analyzer.decodeCallback for fix #74 #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'"
Expand Down
21 changes: 11 additions & 10 deletions src/scanner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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;
}
Expand Down