UnknownObject/quaggaJS
1
0
Fork 0
mirror of https://github.com/serratus/quaggaJS.git synced 2026-08-12 21:21:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes bug that is caused by using custom aspectRatio; Closes #37

Browse Source
This commit is contained in:
Christoph Oberhofer
2015-05-25 23:47:00 +02:00
parent 1042672938
commit eb9fedb794
5 changed files with 66 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/quagga.js
Vendored
+31 -17
View File
@@ -1479,7 +1479,17 @@ define('input_stream',["image_loader"], function(ImageLoader) {
var that = {},
_config = null,
_eventNames = ['canrecord', 'ended'],
_eventHandlers = {};
_eventHandlers = {},
_calculatedWidth,
_calculatedHeight;
function initSize() {
var width = video.videoWidth,
height = video.videoHeight;
_calculatedWidth = _config.size ? width/height > 1 ? _config.size : Math.floor((width/height) * _config.size) : width;
_calculatedHeight = _config.size ? width/height > 1 ? Math.floor((height/width) * _config.size) : _config.size : height;
}
that.getRealWidth = function() {
return video.videoWidth;
@@ -1490,11 +1500,19 @@ define('input_stream',["image_loader"], function(ImageLoader) {
};
that.getWidth = function() {
return _config.halfSample ? video.videoWidth / 2 : video.videoWidth;
return _calculatedWidth;
};
that.getHeight = function() {
return _config.halfSample ? video.videoHeight / 2 : video.videoHeight;
return _calculatedHeight;
};
that.setWidth = function(width) {
_calculatedWidth = width;
};
that.setHeight = function(height) {
_calculatedHeight = height;
};
that.setInputStream = function(config) {
@@ -1552,7 +1570,10 @@ define('input_stream',["image_loader"], function(ImageLoader) {
that.trigger = function(eventName, args) {
var j,
handlers = _eventHandlers[eventName];
if (eventName === 'canrecord') {
initSize();
}
if (handlers && handlers.length > 0) {
for ( j = 0; j < handlers.length; j++) {
handlers[j].apply(that, args);
@@ -1575,14 +1596,6 @@ define('input_stream',["image_loader"], function(ImageLoader) {
return false;
};
that.getWidth = function() {
return this.getConfig().halfSample ? video.videoWidth / 2 : video.videoWidth;
};
that.getHeight = function() {
return this.getConfig().halfSample ? video.videoHeight / 2 : video.videoHeight;
};
return that;
};
@@ -8240,19 +8253,20 @@ function(Code128Reader,
var patchSize,
width = _inputStream.getWidth(),
height = _inputStream.getHeight(),
halfSample = _config.locator.halfSample,
halfSample = _config.locator.halfSample ? 0.5 : 1,
size = {
x: Math.floor(width * (halfSample ? 0.5 : 1)),
y: Math.floor(height * (halfSample ? 0.5 : 1))
x: Math.floor(width * halfSample),
y: Math.floor(height * halfSample)
};
if (_config.locate) {
try {
console.log(size);
patchSize = CVUtils.calculatePatchSize(_config.locator.patchSize, size);
} catch (error) {
if (error instanceof CVUtils.AdjustToSizeError) {
_inputStream.setWidth(Math.floor(width/error.patchSize.x)*error.patchSize.x);
_inputStream.setHeight(Math.floor(height/error.patchSize.y)*error.patchSize.y);
_inputStream.setWidth(Math.floor(Math.floor(size.x/error.patchSize.x)*(1/halfSample)*error.patchSize.x));
_inputStream.setHeight(Math.floor(Math.floor(size.y/error.patchSize.y)*(1/halfSample)*error.patchSize.y));
patchSize = error.patchSize;
}
}
dist/quagga.min.js
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "quagga",
"version": "0.6.4",
"version": "0.6.5",
"description": "An advanced barcode-scanner written in JavaScript",
"main": "dist/quagga.js",
"devDependencies": {
src/input_stream.js
+25 -12
View File
@@ -9,7 +9,17 @@ define(["image_loader"], function(ImageLoader) {
var that = {},
_config = null,
_eventNames = ['canrecord', 'ended'],
_eventHandlers = {};
_eventHandlers = {},
_calculatedWidth,
_calculatedHeight;
function initSize() {
var width = video.videoWidth,
height = video.videoHeight;
_calculatedWidth = _config.size ? width/height > 1 ? _config.size : Math.floor((width/height) * _config.size) : width;
_calculatedHeight = _config.size ? width/height > 1 ? Math.floor((height/width) * _config.size) : _config.size : height;
}
that.getRealWidth = function() {
return video.videoWidth;
@@ -20,11 +30,19 @@ define(["image_loader"], function(ImageLoader) {
};
that.getWidth = function() {
return _config.halfSample ? video.videoWidth / 2 : video.videoWidth;
return _calculatedWidth;
};
that.getHeight = function() {
return _config.halfSample ? video.videoHeight / 2 : video.videoHeight;
return _calculatedHeight;
};
that.setWidth = function(width) {
_calculatedWidth = width;
};
that.setHeight = function(height) {
_calculatedHeight = height;
};
that.setInputStream = function(config) {
@@ -82,7 +100,10 @@ define(["image_loader"], function(ImageLoader) {
that.trigger = function(eventName, args) {
var j,
handlers = _eventHandlers[eventName];
if (eventName === 'canrecord') {
initSize();
}
if (handlers && handlers.length > 0) {
for ( j = 0; j < handlers.length; j++) {
handlers[j].apply(that, args);
@@ -105,14 +126,6 @@ define(["image_loader"], function(ImageLoader) {
return false;
};
that.getWidth = function() {
return this.getConfig().halfSample ? video.videoWidth / 2 : video.videoWidth;
};
that.getHeight = function() {
return this.getConfig().halfSample ? video.videoHeight / 2 : video.videoHeight;
};
return that;
};
src/quagga.js
+6 -5
View File
@@ -111,19 +111,20 @@ function(Code128Reader,
var patchSize,
width = _inputStream.getWidth(),
height = _inputStream.getHeight(),
halfSample = _config.locator.halfSample,
halfSample = _config.locator.halfSample ? 0.5 : 1,
size = {
x: Math.floor(width * (halfSample ? 0.5 : 1)),
y: Math.floor(height * (halfSample ? 0.5 : 1))
x: Math.floor(width * halfSample),
y: Math.floor(height * halfSample)
};
if (_config.locate) {
try {
console.log(size);
patchSize = CVUtils.calculatePatchSize(_config.locator.patchSize, size);
} catch (error) {
if (error instanceof CVUtils.AdjustToSizeError) {
_inputStream.setWidth(Math.floor(width/error.patchSize.x)*error.patchSize.x);
_inputStream.setHeight(Math.floor(height/error.patchSize.y)*error.patchSize.y);
_inputStream.setWidth(Math.floor(Math.floor(size.x/error.patchSize.x)*(1/halfSample)*error.patchSize.x));
_inputStream.setHeight(Math.floor(Math.floor(size.y/error.patchSize.y)*(1/halfSample)*error.patchSize.y));
patchSize = error.patchSize;
}
}