Potential fix for #41

pull/65/head
Christoph Oberhofer 10 years ago
parent c371477f94
commit 8c0fcaa031

@ -1,7 +1,7 @@
quaggaJS quaggaJS
======== ========
- [Changelog](#changelog) (2015-06-09) - [Changelog](#changelog) (2015-06-13)
## What is QuaggaJS? ## What is QuaggaJS?
@ -299,6 +299,10 @@ work.
## <a name="changelog">Changelog</a> ## <a name="changelog">Changelog</a>
### 2015-06-13
- Improvements
- Added fixes for ``Code39Reader`` (trailing whitespace was missing)
### 2015-06-09 ### 2015-06-09
- Features - Features
- Introduced the ``area`` property - Introduced the ``area`` property

21
dist/quagga.js vendored

@ -6890,7 +6890,13 @@ define(
} while(decodedChar !== '*'); } while(decodedChar !== '*');
result.pop(); result.pop();
if (!result.length) {
return null;
}
if(!self._verifyTrailingWhitespace(lastStart, nextStart, counters)) {
return null;
}
return { return {
code : result.join(""), code : result.join(""),
@ -6901,6 +6907,17 @@ define(
}; };
}; };
Code39Reader.prototype._verifyTrailingWhitespace = function(lastStart, nextStart, counters) {
var trailingWhitespaceEnd,
patternSize = ArrayHelper.sum(counters);
trailingWhitespaceEnd = nextStart - lastStart - patternSize;
if ((trailingWhitespaceEnd * 3) >= patternSize) {
return true;
}
return false;
};
Code39Reader.prototype._patternToChar = function(pattern) { Code39Reader.prototype._patternToChar = function(pattern) {
var i, var i,
self = this; self = this;
@ -7902,12 +7919,12 @@ define('frame_grabber',["cv_utils"], function(CVUtils) {
_canvas.height = _canvasSize.y; _canvas.height = _canvasSize.y;
_ctx = _canvas.getContext("2d"); _ctx = _canvas.getContext("2d");
_data = new Uint8Array(_size.x * _size.y); _data = new Uint8Array(_size.x * _size.y);
console.log("FrameGrabber", { console.log("FrameGrabber", JSON.stringify({
size: _size, size: _size,
topRight: topRight, topRight: topRight,
videoSize: _video_size, videoSize: _video_size,
canvasSize: _canvasSize canvasSize: _canvasSize
}); }));
/** /**
* Uses the given array as frame-buffer * Uses the given array as frame-buffer

File diff suppressed because one or more lines are too long

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

@ -82,7 +82,13 @@ define(
} while(decodedChar !== '*'); } while(decodedChar !== '*');
result.pop(); result.pop();
if (!result.length) {
return null;
}
if(!self._verifyTrailingWhitespace(lastStart, nextStart, counters)) {
return null;
}
return { return {
code : result.join(""), code : result.join(""),
@ -93,6 +99,17 @@ define(
}; };
}; };
Code39Reader.prototype._verifyTrailingWhitespace = function(lastStart, nextStart, counters) {
var trailingWhitespaceEnd,
patternSize = ArrayHelper.sum(counters);
trailingWhitespaceEnd = nextStart - lastStart - patternSize;
if ((trailingWhitespaceEnd * 3) >= patternSize) {
return true;
}
return false;
};
Code39Reader.prototype._patternToChar = function(pattern) { Code39Reader.prototype._patternToChar = function(pattern) {
var i, var i,
self = this; self = this;

@ -24,12 +24,12 @@ define(["cv_utils"], function(CVUtils) {
_canvas.height = _canvasSize.y; _canvas.height = _canvasSize.y;
_ctx = _canvas.getContext("2d"); _ctx = _canvas.getContext("2d");
_data = new Uint8Array(_size.x * _size.y); _data = new Uint8Array(_size.x * _size.y);
console.log("FrameGrabber", { console.log("FrameGrabber", JSON.stringify({
size: _size, size: _size,
topRight: topRight, topRight: topRight,
videoSize: _video_size, videoSize: _video_size,
canvasSize: _canvasSize canvasSize: _canvasSize
}); }));
/** /**
* Uses the given array as frame-buffer * Uses the given array as frame-buffer

Loading…
Cancel
Save