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

Updated npm-dependencies

Browse Source
This commit is contained in:
Christoph Oberhofer
2015-09-13 17:49:08 +02:00
parent 9fe7db25b0 e5acf19e08
commit e65df1d131
10 changed files with 109 additions and 5840 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+1 -1
View File
@@ -50,7 +50,7 @@ module.exports = function(grunt) {
"paths" : {
"typedefs" : "typedefs",
"gl-matrix": "../node_modules/gl-matrix/dist/gl-matrix"
"gl-matrix": "../node_modules/gl-matrix/dist/gl-matrix-min"
}
}
}
README.md
+9 -5
View File
@@ -1,7 +1,7 @@
quaggaJS
========
- [Changelog](#changelog) (2015-08-13)
- [Changelog](#changelog) (2015-08-29)
## What is QuaggaJS?
@@ -34,10 +34,10 @@ be aligned with the viewport.
In order to take full advantage of quaggaJS, the browser needs to support the
`getUserMedia` API which is already implemented in recent versions of Firefox,
Chrome and Opera. The API is also available on their mobile counterparts
installed on Android. Safari and IE do not allow the access to the camera yet,
neither on desktop, nor on mobile. You can check [caniuse][caniuse_getusermedia]
for updates.
Chrome, IE (Edge) and Opera. The API is also available on their mobile
counterparts installed on Android (except IE). Safari does not allow the access
to the camera yet, neither on desktop, nor on mobile. You can check
[caniuse][caniuse_getusermedia] for updates.
In cases where real-time decoding is not needed, or the platform does not
support `getUserMedia` QuaggaJS is also capable of decoding image-files using
@@ -377,6 +377,10 @@ on the ``singleChannel`` flag in the configuration when using ``decodeSingle``.
## <a name="changelog">Changelog</a>
### 2015-08-29
- Improvements
- Added support for Internet Explorer (only Edge+ supports `getUserMedia`)
### 2015-08-13
- Improvements
- Added `offProcessed` and `offDetected` methods for detaching event-
dist/quagga.js
Vendored
+55 -5797
View File
File diff suppressed because one or more lines are too long
dist/quagga.min.js
Vendored
+5 -15
View File
File diff suppressed because one or more lines are too long
karma-integration.conf.js
+1 -1
View File
@@ -6,7 +6,7 @@ module.exports = function(config) {
'test-main.js',
'src/typedefs.js',
{pattern: 'node_modules/async/lib/async.js', included: false},
{pattern: 'node_modules/gl-matrix/dist/gl-matrix.js', included: false},
{pattern: 'node_modules/gl-matrix/dist/gl-matrix-min.js', included: false},
{pattern: 'src/*.js', included: false},
{pattern: 'spec/**/*integration.spec.js', included: false},
{pattern: 'test/**/*.*', included: false}
karma.conf.js
+1 -1
View File
@@ -6,7 +6,7 @@ module.exports = function(config) {
'test-main.js',
'src/typedefs.js',
{pattern: 'node_modules/async/lib/async.js', included: false},
{pattern: 'node_modules/gl-matrix/dist/gl-matrix.js', included: false},
{pattern: 'node_modules/gl-matrix/dist/gl-matrix-min.js', included: false},
{pattern: 'src/*.js', included: false},
{pattern: 'spec/**/*.js', included: false},
{pattern: 'test/**/*.*', included: false}
package.json
+21 -18
View File
@@ -1,27 +1,30 @@
{
"name": "quagga",
"version": "0.6.15",
"version": "0.6.16",
"description": "An advanced barcode-scanner written in JavaScript",
"main": "lib/quagga.js",
"browser": "dist/quagga.js",
"devDependencies": {
"async": "^0.9.0",
"grunt": "~0.4.5",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-nodeunit": "~0.4.1",
"grunt-contrib-uglify": "~0.5.0",
"grunt-karma": "^0.9.0",
"async": "^1.4.2",
"chai": "^3.2.0",
"grunt": "^0.4.5",
"grunt-contrib-jshint": "^0.11.3",
"grunt-contrib-nodeunit": "^0.4.1",
"grunt-contrib-uglify": "^0.9.2",
"grunt-karma": "^0.12.1",
"grunt-requirejs": "^0.4.2",
"karma": "latest",
"karma-chai": "latest",
"karma-chrome-launcher": "^0.1.12",
"karma-coverage": "^0.3.1",
"karma-mocha": "latest",
"karma-phantomjs-launcher": "^0.1.4",
"karma-requirejs": "^0.2.2",
"karma": "^0.13.9",
"karma-chai": "0.1.0",
"karma-chrome-launcher": "^0.2.0",
"karma-coverage": "^0.5.2",
"karma-mocha": "~0.2.0",
"karma-phantomjs-launcher": "^0.2.1",
"karma-requirejs": "~0.2.2",
"karma-sinon": "^1.0.4",
"karma-sinon-chai": "^0.2.0",
"sinon": "^1.12.1"
"karma-sinon-chai": "~0.2.0",
"mocha": "^2.3.2",
"requirejs": "^2.1.20",
"sinon": "^1.16.1"
},
"directories": {
"doc": "doc"
@@ -52,7 +55,7 @@
"author": "Christoph Oberhofer <ch.oberhofer@gmail.com>",
"license": "MIT",
"dependencies": {
"get-pixels": "^3.2.2",
"gl-matrix": "^2.1.0"
"get-pixels": "^3.2.3",
"gl-matrix": "^2.3.1"
}
}
src/quagga.js
+6 -1
View File
@@ -333,10 +333,10 @@ function(InputStream,
blobURL = generateWorkerBlob();
workerThread.worker = new Worker(blobURL);
URL.revokeObjectURL(blobURL);
workerThread.worker.onmessage = function(e) {
if (e.data.event === 'initialized') {
URL.revokeObjectURL(blobURL);
workerThread.busy = false;
workerThread.imageData = new Uint8Array(e.data.imageData);
console.log("Worker initialized");
@@ -345,6 +345,8 @@ function(InputStream,
workerThread.imageData = new Uint8Array(e.data.imageData);
workerThread.busy = false;
publishResult(e.data.result, workerThread.imageData);
} else if (e.data.event === 'error') {
console.log("Worker error: " + e.data.message);
}
};
@@ -359,10 +361,13 @@ function(InputStream,
function workerInterface(factory) {
if (factory) {
/* jshint ignore:start */
var Quagga = factory();
if (!Quagga) {
self.postMessage({'event': 'error', message: 'Quagga could not be created'});
return;
}
/* jshint ignore:end */
}
/* jshint ignore:start */
var imageWrapper;
src/typedefs.js
+9
View File
@@ -19,3 +19,12 @@ if (typeof window !== 'undefined') {
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
}
Math.imul = Math.imul || function(a, b) {
var ah = (a >>> 16) & 0xffff,
al = a & 0xffff,
bh = (b >>> 16) & 0xffff,
bl = b & 0xffff;
// the shift by 0 fixes the sign on the high part
// the final |0 converts the unsigned value into a signed value
return ((al * bl) + (((ah * bl + al * bh) << 16) >>> 0)|0);
};
test-main.js
+1 -1
View File
@@ -46,7 +46,7 @@ require.config({
'upc_e_reader': 'src/upc_e_reader',
'upc_reader': 'src/upc_reader',
'async': 'node_modules/async/lib/async',
'gl-matrix': 'node_modules/gl-matrix/dist/gl-matrix',
'gl-matrix': 'node_modules/gl-matrix/dist/gl-matrix-min',
'result_collector': 'src/result_collector',
'i2of5_reader': 'src/i2of5_reader'
},