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

Using inputStream.area as default decoding box when localization is turned off.

Browse Source
This commit is contained in:
Christoph Oberhofer
2015-06-22 21:53:10 +02:00
parent b648014a5e
commit 4f224b782a
9 changed files with 29 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/quagga.js
Vendored
+6 -11
View File
@@ -7744,13 +7744,10 @@ define('barcode_decoder',[
// check if inside image // check if inside image
extendLine(ext); extendLine(ext);
while (ext > 1 && !inputImageWrapper.inImageWithBorder(line[0], 0) || !inputImageWrapper.inImageWithBorder(line[1], 0)) { while (ext > 1 && (!inputImageWrapper.inImageWithBorder(line[0], 0) || !inputImageWrapper.inImageWithBorder(line[1], 0))) {
ext -= Math.floor(ext/2); ext -= Math.ceil(ext/2);
extendLine(-ext); extendLine(-ext);
} }
if (ext <= 1) {
return null;
}
return line; return line;
} }
@@ -8488,9 +8485,7 @@ function(Code128Reader,
} }
function canRecord(cb) { function canRecord(cb) {
if (_config.locate) {
BarcodeLocator.checkImageConstraints(_inputStream, _config.locator); BarcodeLocator.checkImageConstraints(_inputStream, _config.locator);
}
initCanvas(); initCanvas();
_framegrabber = FrameGrabber.create(_inputStream, _canvasContainer.dom.image); _framegrabber = FrameGrabber.create(_inputStream, _canvasContainer.dom.image);
initConfig(); initConfig();
@@ -8557,10 +8552,10 @@ function(Code128Reader,
console.log(_inputImageWrapper.size); console.log(_inputImageWrapper.size);
_boxSize = [ _boxSize = [
vec2.create([20, _inputImageWrapper.size.y / 2 - 100]), vec2.create([0, 0]),
vec2.create([20, _inputImageWrapper.size.y / 2 + 100]), vec2.create([0, _inputImageWrapper.size.y]),
vec2.create([_inputImageWrapper.size.x - 20, _inputImageWrapper.size.y / 2 + 100]), vec2.create([_inputImageWrapper.size.x, _inputImageWrapper.size.y]),
vec2.create([_inputImageWrapper.size.x - 20, _inputImageWrapper.size.y / 2 - 100]) vec2.create([_inputImageWrapper.size.x, 0])
]; ];
BarcodeLocator.init(_inputImageWrapper, _config.locator); BarcodeLocator.init(_inputImageWrapper, _config.locator);
} }
dist/quagga.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
example/file_input.html
+2 -5
View File
@@ -84,11 +84,8 @@
<label> <label>
<span>Workers</span> <span>Workers</span>
<select name="numOfWorkers"> <select name="numOfWorkers">
<option selected="selected" value="0">0</option> <option value="0">0</option>
<option value="1">1</option> <option selected="selected" value="1">1</option>
<option value="2">2</option>
<option value="4">4</option>
<option value="8">8</option>
</select> </select>
</label> </label>
</fieldset> </fieldset>
example/file_input.js
+4 -6
View File
@@ -92,14 +92,12 @@ $(function() {
singleChannel: false singleChannel: false
}, },
locator: { locator: {
patchSize: "medium", patchSize: "large",
halfSample: true halfSample: false
}, },
numOfWorkers: 0, numOfWorkers: 1,
decoder: { decoder: {
readers: ["code_128_reader"], readers: ["code_128_reader"]
showFrequency: true,
showPattern: true
}, },
locate: true, locate: true,
src: null src: null
example/file_input_require.html
+4 -13
View File
@@ -68,29 +68,20 @@
<select name="locator_patch-size"> <select name="locator_patch-size">
<option value="x-small">x-small</option> <option value="x-small">x-small</option>
<option value="small">small</option> <option value="small">small</option>
<option value="medium">medium</option> <option selected="selected" value="medium">medium</option>
<option selected="selected" value="large">large</option> <option value="large">large</option>
<option value="x-large">x-large</option> <option value="x-large">x-large</option>
</select> </select>
</label> </label>
<label> <label>
<span>Half-Sample</span> <span>Half-Sample</span>
<input type="checkbox" name="locator_half-sample" /> <input type="checkbox" checked="checked"
name="locator_half-sample" />
</label> </label>
<label> <label>
<span>Single Channel</span> <span>Single Channel</span>
<input type="checkbox" name="input-stream_single-channel" /> <input type="checkbox" name="input-stream_single-channel" />
</label> </label>
<label>
<span>Workers</span>
<select name="numOfWorkers">
<option selected="selected" value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="4">4</option>
<option value="8">8</option>
</select>
</label>
</fieldset> </fieldset>
</div> </div>
<div id="result_strip"> <div id="result_strip">
example/live_w_locator.js
+2 -2
View File
@@ -117,9 +117,9 @@ $(function() {
patchSize: "medium", patchSize: "medium",
halfSample: true halfSample: true
}, },
numOfWorkers: 1, numOfWorkers: 4,
decoder: { decoder: {
readers : ["ean_reader"] readers : ["code_128_reader"]
}, },
locate: true locate: true
}, },
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "quagga", "name": "quagga",
"version": "0.6.10", "version": "0.6.11",
"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": {
src/barcode_decoder.js
+2 -5
View File
@@ -134,13 +134,10 @@ define([
// check if inside image // check if inside image
extendLine(ext); extendLine(ext);
while (ext > 1 && !inputImageWrapper.inImageWithBorder(line[0], 0) || !inputImageWrapper.inImageWithBorder(line[1], 0)) { while (ext > 1 && (!inputImageWrapper.inImageWithBorder(line[0], 0) || !inputImageWrapper.inImageWithBorder(line[1], 0))) {
ext -= Math.floor(ext/2); ext -= Math.ceil(ext/2);
extendLine(-ext); extendLine(-ext);
} }
if (ext <= 1) {
return null;
}
return line; return line;
} }
src/quagga.js
+4 -6
View File
@@ -111,9 +111,7 @@ function(Code128Reader,
} }
function canRecord(cb) { function canRecord(cb) {
if (_config.locate) {
BarcodeLocator.checkImageConstraints(_inputStream, _config.locator); BarcodeLocator.checkImageConstraints(_inputStream, _config.locator);
}
initCanvas(); initCanvas();
_framegrabber = FrameGrabber.create(_inputStream, _canvasContainer.dom.image); _framegrabber = FrameGrabber.create(_inputStream, _canvasContainer.dom.image);
initConfig(); initConfig();
@@ -180,10 +178,10 @@ function(Code128Reader,
console.log(_inputImageWrapper.size); console.log(_inputImageWrapper.size);
_boxSize = [ _boxSize = [
vec2.create([20, _inputImageWrapper.size.y / 2 - 100]), vec2.create([0, 0]),
vec2.create([20, _inputImageWrapper.size.y / 2 + 100]), vec2.create([0, _inputImageWrapper.size.y]),
vec2.create([_inputImageWrapper.size.x - 20, _inputImageWrapper.size.y / 2 + 100]), vec2.create([_inputImageWrapper.size.x, _inputImageWrapper.size.y]),
vec2.create([_inputImageWrapper.size.x - 20, _inputImageWrapper.size.y / 2 - 100]) vec2.create([_inputImageWrapper.size.x, 0])
]; ];
BarcodeLocator.init(_inputImageWrapper, _config.locator); BarcodeLocator.init(_inputImageWrapper, _config.locator);
} }