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

Merge pull request #65 from serratus/issue-38

Browse Source 
closes #38 by adding node support
This commit is contained in:
Christoph Oberhofer
2015-09-15 20:03:49 +02:00
parent e5acf19e08 b340883595
commit a852394bd9
25 changed files with 531 additions and 35064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+1 -10
View File
@@ -45,21 +45,12 @@ module.exports = function(grunt) {
"typedefs" : {
"deps" : [],
"exports" : "typedefs"
},
"glMatrix" : {
"deps" : ["typedefs"],
"exports" : "glMatrix"
},
"glMatrixAddon" : {
"deps" : ["glMatrix"],
"exports" : "glMatrixAddon"
}
},
"paths" : {
"typedefs" : "typedefs",
"glMatrix" : "vendor/glMatrix",
"glMatrixAddon" : "glMatrixAddon"
"gl-matrix": "../node_modules/gl-matrix/dist/gl-matrix-min"
}
}
}
README.md
+68 -7
View File
@@ -1,7 +1,7 @@
quaggaJS
========
- [Changelog](#changelog) (2015-08-29)
- [Changelog](#changelog) (2015-09-15)
## What is QuaggaJS?
@@ -43,12 +43,12 @@ 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
the File API or other URL sources.
## Getting Started
## Installing
You can simply include `dist/quagga.min.js` in your project and you are ready
to go.
QuaggaJS can be installed using __npm__, __bower__, or by including it with
the __script__ tag.
If you want to keep your project modular, you can also install QuaggaJS via npm:
### NPM
```console
> npm install quagga
@@ -57,12 +57,33 @@ If you want to keep your project modular, you can also install QuaggaJS via npm:
And then import it as dependency in your project:
```javascript
var quagga = require('quagga');
var Quagga = require('quagga');
```
Currently, the full functionality is only available through the browser. When
using QuaggaJS within __node__, only file-based decoding is available. See the
example for [node_examples](#node-example).
### Bower
You can also install QuaggaJS through __bower__:
```console
> bower install quagga
```
### Script-Tag Anno 1998
You can simply include `dist/quagga.min.js` in your project and you are ready
to go.
## Getting Started
For starters, have a look at the [examples][github_examples] to get an idea
where to go from here.
## <a name="Building">Building</a>
You can build the library yourself by simply cloning the repo and typing:
@@ -295,7 +316,39 @@ Quagga.decodeSingle({
locate: true, // try to locate the barcode in the image
src: '/test/fixtures/code_128/image-001.jpg' // or 'data:image/jpg;base64,' + data
}, function(result){
console.log(result);
if(result.codeResult) {
console.log("result", result.codeResult.code);
} else {
console.log("not detected");
}
});
```
### <a name="node-example">Using node</a>
The following example illustrates the use of QuaggaJS within a node
environment. It's almost identical to the browser version with the difference
that node does not support web-workers out of the box. Therefore the config
property `numOfWorkers` must be explicitly set to `0`.
```javascript
var Quagga = require('quagga');
Quagga.decodeSingle({
src: "image-abc-123.jpg",
numOfWorkers: 0, // Needs to be 0 when used within node
inputStream: {
size: 800 // restrict input-size to be 800px in width (long-side)
},
decoder: {
readers: ["code_128_reader"] // List of active readers
},
}, function(result) {
if(result.codeResult) {
console.log("result", result.codeResult.code);
} else {
console.log("not detected");
}
});
```
@@ -377,6 +430,14 @@ on the ``singleChannel`` flag in the configuration when using ``decodeSingle``.
## <a name="changelog">Changelog</a>
### 2015-09-15
Take a look at the release-notes ([0.7.0]
(https://github.com/serratus/quaggaJS/releases/tag/v0.7.0))
- Features
- Added basic support for running QuaggaJS inside __node__ (see [example]
(#node-example))
### 2015-08-29
- Improvements
- Added support for Internet Explorer (only Edge+ supports `getUserMedia`)
dist/quagga.js
Vendored
+78 -2314
View File
File diff suppressed because one or more lines are too long
dist/quagga.min.js
Vendored
+5 -5
View File
File diff suppressed because one or more lines are too long
example/file_input_require.html
+1 -1
View File
@@ -96,6 +96,6 @@
</p>
</footer>
<script src="../src/vendor/jquery-1.9.0.min.js" type="text/javascript"></script>
<script data-main="file_input_require.js" src="../src/vendor/require.js"></script>
<script data-main="file_input_require.js" src="../node_modules/requirejs/require.js"></script>
</body>
</html>
example/file_input_require.js
+4 -13
View File
@@ -4,25 +4,16 @@ requirejs.config({
"typedefs" : {
"deps" : [],
"exports" : "typedefs"
},
"glMatrix" : {
"deps" : ["typedefs"],
"exports" : "glMatrix"
},
"glMatrixAddon" : {
"deps" : ["glMatrix"],
"exports" : "glMatrixAddon"
}
},
"paths" : {
"typedefs" : "typedefs",
"glMatrix" : "vendor/glMatrix",
"glMatrixAddon" : "glMatrixAddon"
"gl-matrix": "../node_modules/gl-matrix/dist/gl-matrix-min"
}
});
define(['quagga'], function(Quagga) {
requirejs(['quagga'], function(Quagga) {
var App = {
init: function() {
App.attachListeners();
@@ -116,13 +107,13 @@ define(['quagga'], function(Quagga) {
singleChannel: false
},
locator: {
patchSize: "large",
patchSize: "medium",
halfSample: true,
showCanvas: true
},
numOfWorkers: 0,
decoder: {
readers: ["i2of5_reader"],
readers: ["code_128_reader"],
showFrequency: true,
showPattern: true
},
example/node-test.js
+21
View File
@@ -0,0 +1,21 @@
var Quagga = require('../lib/quagga');
Quagga.decodeSingle({
src: "../test/fixtures/code_128/image-001.jpg",
numOfWorkers: 0,
inputStream: {
size: 800,
area: {
top: "10%",
right: "5%",
left: "5%",
bottom: "10%"
}
}
}, function(result) {
if(result.codeResult) {
console.log("result", result.codeResult.code);
} else {
console.log("not detected");
}
});
karma-integration.conf.js
+1 -1
View File
@@ -4,9 +4,9 @@ module.exports = function(config) {
frameworks: ['mocha', 'requirejs', 'chai', 'sinon', 'sinon-chai'],
files: [
'test-main.js',
'src/vendor/glMatrix.js',
'src/typedefs.js',
{pattern: 'node_modules/async/lib/async.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
@@ -4,9 +4,9 @@ module.exports = function(config) {
frameworks: ['mocha', 'requirejs', 'chai', 'sinon', 'sinon-chai'],
files: [
'test-main.js',
'src/vendor/glMatrix.js',
'src/typedefs.js',
{pattern: 'node_modules/async/lib/async.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}
lib/frame_grabber.js
+101
View File
@@ -0,0 +1,101 @@
/* jshint undef: true, unused: true, browser:true, devel: true */
/* global define */
define(["cv_utils"], function(CVUtils) {
"use strict";
var Ndarray = require("ndarray"),
Interp2D = require("ndarray-linear-interpolate").d2;
var FrameGrabber = {};
FrameGrabber.create = function(inputStream) {
var _that = {},
_streamConfig = inputStream.getConfig(),
_video_size = CVUtils.imageRef(inputStream.getRealWidth(), inputStream.getRealHeight()),
_canvasSize = inputStream.getCanvasSize(),
_size = CVUtils.imageRef(inputStream.getWidth(), inputStream.getHeight()),
_topRight = inputStream.getTopRight(),
_data = new Uint8Array(_size.x * _size.y),
_grayData = new Uint8Array(_video_size.x * _video_size.y),
_canvasData = new Uint8Array(_canvasSize.x * _canvasSize.y),
_grayImageArray = Ndarray(_grayData, [_video_size.y, _video_size.x]).transpose(1, 0),
_canvasImageArray = Ndarray(_canvasData, [_canvasSize.y, _canvasSize.x]).transpose(1, 0),
_targetImageArray = _canvasImageArray.hi(_topRight.x + _size.x, _topRight.y + _size.y).lo(_topRight.x, _topRight.y),
_stepSizeX = _video_size.x/_canvasSize.x,
_stepSizeY = _video_size.y/_canvasSize.y;
console.log("FrameGrabber", JSON.stringify({
videoSize: _grayImageArray.shape,
canvasSize: _canvasImageArray.shape,
stepSize: [_stepSizeX, _stepSizeY],
size: _targetImageArray.shape,
topRight: _topRight
}));
/**
* Uses the given array as frame-buffer
*/
_that.attachData = function(data) {
_data = data;
};
/**
* Returns the used frame-buffer
*/
_that.getData = function() {
return _data;
};
/**
* Fetches a frame from the input-stream and puts into the frame-buffer.
* The image-data is converted to gray-scale and then half-sampled if configured.
*/
_that.grab = function() {
var frame = inputStream.getFrame();
if (frame) {
this.scaleAndCrop(frame);
return true;
} else {
return false;
}
};
_that.scaleAndCrop = function(frame) {
var x,
y;
// 1. compute full-sized gray image
CVUtils.computeGray(frame.data, _grayData);
// 2. interpolate
for (y = 0; y < _canvasSize.y; y++) {
for (x = 0; x < _canvasSize.x; x++) {
_canvasImageArray.set(x, y, (Interp2D(_grayImageArray, x * _stepSizeX, y * _stepSizeY)) | 0);
}
}
// targetImageArray must be equal to targetSize
if (_targetImageArray.shape[0] !== _size.x ||
_targetImageArray.shape[1] !== _size.y) {
throw new Error("Shapes do not match!");
}
// 3. crop
for (y = 0; y < _size.y; y++) {
for (x = 0; x < _size.x; x++) {
_data[y * _size.x + x] = _targetImageArray.get(x, y);
}
}
},
_that.getSize = function() {
return _size;
};
return _that;
};
return (FrameGrabber);
});
lib/input_stream.js
+160
View File
@@ -0,0 +1,160 @@
/* jshint undef: true, unused: true, browser:true, devel: true */
/* global define */
define(function() {
"use strict";
var GetPixels = require("get-pixels");
var InputStream = {};
InputStream.createImageStream = function() {
var that = {};
var _config = null;
var width = 0,
height = 0,
frameIdx = 0,
paused = true,
loaded = false,
frame = null,
baseUrl,
ended = false,
size,
calculatedWidth,
calculatedHeight,
_eventNames = ['canrecord', 'ended'],
_eventHandlers = {},
_topRight = {x: 0, y: 0},
_canvasSize = {x: 0, y: 0};
function loadImages() {
loaded = false;
GetPixels(baseUrl, function(err, pixels) {
if (err) {
console.log(err);
exit(1);
}
loaded = true;
console.log(pixels.shape);
frame = pixels;
width = pixels.shape[0];
height = pixels.shape[1];
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;
_canvasSize.x = calculatedWidth;
_canvasSize.y = calculatedHeight;
setTimeout(function() {
publishEvent("canrecord", []);
}, 0);
});
}
function publishEvent(eventName, args) {
var j,
handlers = _eventHandlers[eventName];
if (handlers && handlers.length > 0) {
for ( j = 0; j < handlers.length; j++) {
handlers[j].apply(that, args);
}
}
}
that.trigger = publishEvent;
that.getWidth = function() {
return calculatedWidth;
};
that.getHeight = function() {
return calculatedHeight;
};
that.setWidth = function(width) {
calculatedWidth = width;
};
that.setHeight = function(height) {
calculatedHeight = height;
};
that.getRealWidth = function() {
return width;
};
that.getRealHeight = function() {
return height;
};
that.setInputStream = function(stream) {
_config = stream;
baseUrl = _config.src;
size = 1;
loadImages();
};
that.ended = function() {
return ended;
};
that.setAttribute = function() {};
that.getConfig = function() {
return _config;
};
that.pause = function() {
paused = true;
};
that.play = function() {
paused = false;
};
that.setCurrentTime = function(time) {
frameIdx = time;
};
that.addEventListener = function(event, f) {
if (_eventNames.indexOf(event) !== -1) {
if (!_eventHandlers[event]) {
_eventHandlers[event] = [];
}
_eventHandlers[event].push(f);
}
};
that.setTopRight = function(topRight) {
_topRight.x = topRight.x;
_topRight.y = topRight.y;
};
that.getTopRight = function() {
return _topRight;
};
that.setCanvasSize = function(size) {
_canvasSize.x = size.x;
_canvasSize.y = size.y;
};
that.getCanvasSize = function() {
return _canvasSize;
};
that.getFrame = function() {
if (!loaded){
return null;
}
return frame;
};
return that;
};
return (InputStream);
});
lib/quagga.js
+13
View File
@@ -0,0 +1,13 @@
var requirejs = require('requirejs'),
path = require('path');
requirejs.config({
"baseUrl" : path.resolve(__dirname, '..', 'src'),
"paths" : {
"typedefs" : "typedefs",
"input_stream": "../lib/input_stream",
"frame_grabber": "../lib/frame_grabber"
},
nodeRequire: require
});
module.exports = requirejs('quagga');
package.json
+28 -18
View File
@@ -1,26 +1,29 @@
{
"name": "quagga",
"version": "0.6.16",
"version": "0.7.0",
"description": "An advanced barcode-scanner written in JavaScript",
"main": "dist/quagga.js",
"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",
"sinon": "^1.16.1"
},
"directories": {
"doc": "doc"
@@ -49,5 +52,12 @@
"imageprocessing"
],
"author": "Christoph Oberhofer <ch.oberhofer@gmail.com>",
"license": "MIT"
"license": "MIT",
"dependencies": {
"get-pixels": "^3.2.3",
"gl-matrix": "^2.3.1",
"ndarray": "^1.0.18",
"ndarray-linear-interpolate": "^1.0.0",
"requirejs": "^2.1.20"
}
}
src/barcode_locator.js
+12 -11
View File
@@ -1,8 +1,8 @@
/* jshint undef: true, unused: true, browser:true, devel: true */
/* global define, mat2, vec2 */
/* global define */
define("barcode_locator", ["image_wrapper", "cv_utils", "rasterizer", "tracer", "skeletonizer", "array_helper", "image_debug"],
function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, ImageDebug) {
define("barcode_locator", ["image_wrapper", "cv_utils", "rasterizer", "tracer", "skeletonizer", "array_helper", "image_debug", "gl-matrix"],
function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, ImageDebug, glMatrix) {
var _config,
_currentImageWrapper,
@@ -25,6 +25,8 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
_numPatches = {x: 0, y: 0},
_inputImageWrapper,
_skeletonizer,
vec2 = glMatrix.vec2,
mat2 = glMatrix.mat2,
self = this;
function initBuffers() {
@@ -100,15 +102,14 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
overAvg += 180;
}
//console.log(overAvg);
overAvg = (180 - overAvg) * Math.PI / 180;
transMat = mat2.create([Math.cos(overAvg), -Math.sin(overAvg), Math.sin(overAvg), Math.cos(overAvg)]);
transMat = mat2.clone([Math.cos(overAvg), Math.sin(overAvg), -Math.sin(overAvg), Math.cos(overAvg)]);
// iterate over patches and rotate by angle
for ( i = 0; i < patches.length; i++) {
patch = patches[i];
for ( j = 0; j < 4; j++) {
mat2.xVec2(transMat, patch.box[j]);
vec2.transformMat2(patch.box[j], patch.box[j], transMat);
}
if (_config.boxFromPatches.showTransformed) {
@@ -143,9 +144,9 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
scale = _config.halfSample ? 2 : 1;
// reverse rotation;
transMat = mat2.inverse(transMat);
transMat = mat2.invert(transMat, transMat);
for ( j = 0; j < 4; j++) {
mat2.xVec2(transMat, box[j]);
vec2.transformMat2(box[j], box[j], transMat);
}
if (_config.boxFromPatches.showBB) {
@@ -153,7 +154,7 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
}
for ( j = 0; j < 4; j++) {
vec2.scale(box[j], scale);
vec2.scale(box[j], box[j], scale);
}
return box;
@@ -377,10 +378,10 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
x : x,
y : y
},
box : [vec2.create([x, y]), vec2.create([x + _subImageWrapper.size.x, y]), vec2.create([x + _subImageWrapper.size.x, y + _subImageWrapper.size.y]), vec2.create([x, y + _subImageWrapper.size.y])],
box : [vec2.clone([x, y]), vec2.clone([x + _subImageWrapper.size.x, y]), vec2.clone([x + _subImageWrapper.size.x, y + _subImageWrapper.size.y]), vec2.clone([x, y + _subImageWrapper.size.y])],
moments : matchingMoments,
rad : avg,
vec : vec2.create([Math.cos(avg), Math.sin(avg)])
vec : vec2.clone([Math.cos(avg), Math.sin(avg)])
};
patchesFound.push(patch);
}
src/cluster.js
+6 -5
View File
@@ -1,9 +1,10 @@
/* jshint undef: true, unused: true, browser:true, devel: true */
/* global define, vec2 */
/* global define */
define(function() {
define(["gl-matrix"], function(glMatrix) {
"use strict";
var vec2 = glMatrix.vec2;
/**
* Creates a cluster for grouping similar orientations of datapoints
*/
@@ -11,7 +12,7 @@ define(function() {
create : function(point, threshold) {
var points = [], center = {
rad : 0,
vec : vec2.create([0, 0])
vec : vec2.clone([0, 0])
}, pointMap = {};
function init() {
@@ -30,7 +31,7 @@ define(function() {
sum += points[i].rad;
}
center.rad = sum / points.length;
center.vec = vec2.create([Math.cos(center.rad), Math.sin(center.rad)]);
center.vec = vec2.clone([Math.cos(center.rad), Math.sin(center.rad)]);
}
init();
src/cv_utils.js
+7 -5
View File
@@ -1,7 +1,7 @@
/* jshint undef: true, unused: true, browser:true, devel: true */
/* global define, vec2, vec3 */
/* global define */
define(['cluster', 'glMatrixAddon', "array_helper"], function(Cluster2, glMatrixAddon, ArrayHelper) {
define(['cluster', "array_helper", "gl-matrix"], function(Cluster2, ArrayHelper, glMatrix) {
"use strict";
/*
@@ -14,7 +14,9 @@ define(['cluster', 'glMatrixAddon', "array_helper"], function(Cluster2, glMatrix
* @class Represents a collection of useful CV algorithms/functions
*/
var CVUtils = {};
var CVUtils = {},
vec2 = glMatrix.vec2,
vec3 = glMatrix.vec3;
/**
* @param x x-coordinate
@@ -26,10 +28,10 @@ define(['cluster', 'glMatrixAddon', "array_helper"], function(Cluster2, glMatrix
x : x,
y : y,
toVec2 : function() {
return vec2.create([this.x, this.y]);
return vec2.clone([this.x, this.y]);
},
toVec3 : function() {
return vec3.create([this.x, this.y, 1]);
return vec3.clone([this.x, this.y, 1]);
},
round : function() {
this.x = this.x > 0.0 ? Math.floor(this.x + 0.5) : Math.floor(this.x - 0.5);
src/glMatrixAddon.js
-408
View File
@@ -1,408 +0,0 @@
/*
* glMatrixAddon.js
* Extension to the glMatrix library. The original glMatrix library
* was created by Brandon Jones.
*/
mat4.xVec4 = function(mat, vec, dest){
if(!dest) { dest = vec; }
var x = vec[0], y = vec[1], z = vec[2], w = vec[3];
dest[0] = mat[0]*x + mat[1]*y + mat[2]*z + mat[3]*w;
dest[1] = mat[4]*x + mat[5]*y + mat[6]*z + mat[7]*w;
dest[2] = mat[8]*x + mat[9]*y + mat[10]*z + mat[11]*w;
dest[3] = mat[12]*x + mat[13]*y + mat[14]*z + mat[15]*w;
return dest;
};
mat3.scale = function(mat, scalar, dest){
if(!dest || mat == dest) {
mat[0] *= scalar;
mat[1] *= scalar;
mat[2] *= scalar;
mat[3] *= scalar;
mat[4] *= scalar;
mat[5] *= scalar;
mat[6] *= scalar;
mat[7] *= scalar;
mat[8] *= scalar;
return mat;
}
dest = mat3.create();
dest[0] = mat[0]*scalar;
dest[1] = mat[1]*scalar;
dest[2] = mat[2]*scalar;
dest[3] = mat[3]*scalar;
dest[4] = mat[4]*scalar;
dest[5] = mat[5]*scalar;
dest[6] = mat[6]*scalar;
dest[7] = mat[7]*scalar;
dest[8] = mat[8]*scalar;
return dest;
};
mat3.inverse = function(mat, dest){
if(!dest) { dest = mat; }
var ha00 = mat[0], ha01 = mat[1], ha02 = mat[2];
var ha10 = mat[3], ha11 = mat[4], ha12 = mat[5];
var ha20 = mat[6], ha21 = mat[7], ha22 = mat[8];
var invDetA = 1/(ha00*ha11*ha22 + ha01*ha12*ha20 + ha02*ha10*ha21 - ha02*ha11*ha20 - ha01*ha10*ha22 - ha00*ha12*ha21);
dest[0] = (ha11*ha22 - ha12*ha21)*invDetA;
dest[1] = (ha02*ha21 - ha01*ha22)*invDetA;
dest[2] = (ha01*ha12 - ha02*ha11)*invDetA;
dest[3] = (ha12*ha20 - ha10*ha22)*invDetA;
dest[4] = (ha00*ha22 - ha02*ha20)*invDetA;
dest[5] = (ha02*ha10 - ha00*ha12)*invDetA;
dest[6] = (ha10*ha21 - ha11*ha20)*invDetA;
dest[7] = (ha01*ha20 - ha00*ha21)*invDetA;
dest[8] = (ha00*ha11 - ha01*ha10)*invDetA;
return dest;
};
mat3.multiply = function(mat, mat2, dest) {
if(!dest) { dest = mat; }
var ha00 = mat[0], ha01 = mat[1], ha02 = mat[2];
var ha10 = mat[3], ha11 = mat[4], ha12 = mat[5];
var ha20 = mat[6], ha21 = mat[7], ha22 = mat[8];
var hb00 = mat2[0], hb01 = mat2[1], hb02 = mat2[2];
var hb10 = mat2[3], hb11 = mat2[4], hb12 = mat2[5];
var hb20 = mat2[6], hb21 = mat2[7], hb22 = mat2[8];
dest[0] = ha00*hb00 + ha01*hb10 + ha02*hb20;
dest[1] = ha00*hb01 + ha01*hb11 + ha02*hb21;
dest[2] = ha00*hb02 + ha01*hb12 + ha02*hb22;
dest[3] = ha10*hb00 + ha11*hb10 + ha12*hb20;
dest[4] = ha10*hb01 + ha11*hb11 + ha12*hb21;
dest[5] = ha10*hb02 + ha11*hb12 + ha12*hb22;
dest[6] = ha20*hb00 + ha21*hb10 + ha22*hb20;
dest[7] = ha20*hb01 + ha21*hb11 + ha22*hb21;
dest[8] = ha20*hb02 + ha21*hb12 + ha22*hb22;
return dest;
};
mat3.xVec3 = function(mat, vec, dest){
if(!dest) { dest = vec; }
var x = vec[0], y = vec[1], z = vec[2];
dest[0] = mat[0]*x + mat[1]*y + mat[2]*z;
dest[1] = mat[3]*x + mat[4]*y + mat[5]*z;
dest[2] = mat[6]*x + mat[7]*y + mat[8]*z;
return dest;
};
var vec4={};
vec4.create = function(vec){
var dest;
if(vec) {
dest = new glMatrixArrayType(4);
dest[0] = vec[0];
dest[1] = vec[1];
dest[2] = vec[2];
dest[3] = vec[3];
} else {
if(glMatrixArrayType === Array)
dest = new glMatrixArrayType([0,0,0,0]);
else
dest = new glMatrixArrayType(4);
}
return dest;
};
vec4.project = function(vec, dest){
if(!dest) { dest = vec; }
dest[0] = vec[0]/vec[3];
dest[1] = vec[1]/vec[3];
dest[2] = vec[2]/vec[3];
return dest;
};
vec4.scale = function(vec, val, dest){
if(!dest || vec == dest) {
vec[0] *= val;
vec[1] *= val;
vec[2] *= val;
vec[4] *= val;
return vec;
}
dest[0] = vec[0]*val;
dest[1] = vec[1]*val;
dest[2] = vec[2]*val;
dest[3] = vec[3]*val;
return dest;
};
vec4.xMat4 = function(vec, mat, dest){
if(!dest) { dest = vec; }
var x = vec[0], y = vec[1], z = vec[2], w = vec[3];
dest[0] = mat[0]*x + mat[4]*y + mat[8]*z + mat[12]*w;
dest[1] = mat[1]*x + mat[5]*y + mat[9]*z + mat[13]*w;
dest[2] = mat[2]*x + mat[6]*y + mat[10]*z + mat[14]*w;
dest[3] = mat[3]*x + mat[7]*y + mat[11]*z + mat[15]*w;
return dest;
};
var mat2 = {};
mat2.create = function(mat){
var dest;
if(mat) {
dest = new glMatrixArrayType(4);
dest[0] = mat[0];
dest[1] = mat[1];
dest[2] = mat[2];
dest[3] = mat[3];
} else {
if(glMatrixArrayType === Array)
dest = new glMatrixArrayType([0,0,0,0]);
else
dest = new glMatrixArrayType(4);
}
return dest;
};
mat2.xVec2 = function(mat, vec, dest){
if(!dest) { dest = vec; }
var x = vec[0], y = vec[1];
dest[0] = mat[0]*x + mat[1]*y;
dest[1] = mat[2]*x + mat[3]*y;
return dest;
};
mat2.scale = function(mat, scale, dest){
if(!dest || mat == dest) {
mat[0] *= scale;
mat[1] *= scale;
mat[2] *= scale;
mat[3] *= scale;
return mat;
}
dest[0] = mat[0]*scale;
dest[1] = mat[1]*scale;
dest[2] = mat[2]*scale;
dest[3] = mat[3]*scale;
return dest;
};
mat2.determinant = function(mat){
return mat[0]*mat[3] - mat[1]*mat[2];
};
mat2.inverse = function(mat){
var scale = 1/(mat2.determinant(mat));
var a = mat[3]*scale,
b = -mat[1]*scale,
c = -mat[2]*scale,
d = mat[0];
mat[0] = a;
mat[1] = b;
mat[2] = c;
mat[3] = d;
return mat;
};
var vec2 = {};
vec2.create = function(vec){
var dest;
if(vec) {
dest = new glMatrixArrayType(2);
dest[0] = vec[0];
dest[1] = vec[1];
} else {
if(glMatrixArrayType === Array)
dest = new glMatrixArrayType([0,0]);
else
dest = new glMatrixArrayType(2);
}
return dest;
};
vec2.subtract = function(vec, vec2, dest) {
if(!dest || vec == dest) {
vec[0] -= vec2[0];
vec[1] -= vec2[1];
return vec;
}
dest[0] = vec[0] - vec2[0];
dest[1] = vec[1] - vec2[1];
return dest;
};
vec2.add = function(vec, vec2, dest) {
if(!dest || vec == dest) {
vec[0] += vec2[0];
vec[1] += vec2[1];
return vec;
}
dest[0] = vec[0] + vec2[0];
dest[1] = vec[1] + vec2[1];
return dest;
};
vec2.scale = function(vec, val, dest) {
if(!dest || vec == dest) {
vec[0] *= val;
vec[1] *= val;
return vec;
}
dest[0] = vec[0]*val;
dest[1] = vec[1]*val;
return dest;
};
vec2.normalize = function(vec, dest) {
if(!dest) { dest = vec; }
var x = vec[0], y = vec[1];
var len = Math.sqrt(x*x + y*y);
if (!len) {
dest[0] = 0;
dest[1] = 0;
return dest;
} else if (len == 1) {
dest[0] = x;
dest[1] = y;
return dest;
}
len = 1 / len;
dest[0] = x*len;
dest[1] = y*len;
return dest;
};
vec2.dot = function(vec, vec2){
return vec[0]*vec2[0] + vec[1]*vec2[1];
};
vec2.multiply = function(vec, vec2, dest){
if(!dest) { dest = vec; }
dest[0] = vec[0]*vec2[0];
dest[1] = vec[1]*vec2[1];
return dest;
};
/**
* @param vec vec2 to be unprojected [x,y] -> [x,y,1]
* @returns vec3 unprojected vector
*/
vec2.unproject = function(vec){
return vec3.create([vec[0], vec[1], 1]);
};
vec2.length = function(vec){
return Math.sqrt(vec[0]*vec[0] + vec[1]*vec[1]);
};
vec2.perspectiveProject = function(vec){
var result = vec2.create(vec);
return vec2.scale(result, 1/vec[2]);
};
/**
* @param vec vec3 to be projected [x,y,z] -> [x/z,y/z]
* @returns vec2 projected vector
*/
vec3.project = function(vec){
return vec2.scale(vec2.create(vec), 1/vec[2]);
};
var vec6 = {};
vec6.scale = function(vec, val, dest){
if(!dest || vec == dest) {
vec[0] *= val;
vec[1] *= val;
vec[2] *= val;
vec[3] *= val;
vec[4] *= val;
vec[5] *= val;
return vec;
}
dest[0] = vec[0]*val;
dest[1] = vec[1]*val;
dest[2] = vec[2]*val;
dest[3] = vec[3]*val;
dest[4] = vec[4]*val;
dest[5] = vec[5]*val;
return dest;
};
vec6.subtract = function(vec, vec2, dest){
if(!dest || vec == dest) {
vec[0] -= vec2[0];
vec[1] -= vec2[1];
vec[2] -= vec2[2];
vec[3] -= vec2[3];
vec[4] -= vec2[4];
vec[5] -= vec2[5];
return vec;
}
dest[0] = vec[0] - vec2[0];
dest[1] = vec[1] - vec2[1];
dest[2] = vec[2] - vec2[2];
dest[3] = vec[3] - vec2[3];
dest[4] = vec[4] - vec2[4];
dest[5] = vec[5] - vec2[5];
return dest;
};
vec6.dot = function(vec, vec2){
return vec[0]*vec2[0] + vec[1]*vec2[1] + vec[2]*vec2[2] + vec[3]*vec2[3] + vec[4]*vec2[4] + vec[5]*vec2[5];
};
var mat6 = {};
mat6.xVec6 = function(mat, vec, dest){
if(!dest) { dest = vec; }
var x = vec[0], y = vec[1], z = vec[2], u = vec[3], w = vec[4], v = vec[5];
dest[0] = mat[0]*x + mat[1]*y + mat[2]*z + mat[3]*u + mat[4]*w + mat[5]*v;
dest[1] = mat[6]*x + mat[7]*y + mat[8]*z + mat[9]*u + mat[10]*w + mat[11]*v;
dest[2] = mat[12]*x + mat[13]*y + mat[14]*z + mat[15]*u + mat[16]*w + mat[17]*v;
dest[3] = mat[18]*x + mat[19]*y + mat[20]*z + mat[21]*u + mat[22]*w + mat[23]*v;
dest[4] = mat[24]*x + mat[25]*y + mat[26]*z + mat[27]*u + mat[28]*w + mat[29]*v;
dest[5] = mat[30]*x + mat[31]*y + mat[32]*z + mat[33]*u + mat[34]*w + mat[35]*v;
return dest;
};
mat3.xVec3 = function(mat, vec, dest){
if(!dest) { dest = vec; }
var x = vec[0], y = vec[1], z = vec[2];
dest[0] = mat[0]*x + mat[1]*y + mat[2]*z;
dest[1] = mat[3]*x + mat[4]*y + mat[5]*z;
dest[2] = mat[6]*x + mat[7]*y + mat[8]*z;
return dest;
};
src/image_wrapper.js
+11 -8
View File
@@ -1,14 +1,17 @@
/* jshint undef: true, unused: true, browser:true, devel: true */
/* global define, vec2, mat2 */
/* global define */
define([
"subImage",
"cv_utils",
"array_helper"
"array_helper",
"gl-matrix"
],
function(SubImage, CVUtils, ArrayHelper) {
function(SubImage, CVUtils, ArrayHelper, glMatrix) {
'use strict';
var vec2 = glMatrix.vec2,
mat2 = glMatrix.mat2;
/**
* Represents a basic image combining the data and size.
@@ -62,11 +65,11 @@ define([
*/
ImageWrapper.transform = function(inImg, outImg, M, inOrig, outOrig) {
var w = outImg.size.x, h = outImg.size.y, iw = inImg.size.x, ih = inImg.size.y;
var across = vec2.create([M[0], M[2]]);
var down = vec2.create([M[1], M[3]]);
var across = vec2.clone([M[0], M[2]]);
var down = vec2.clone([M[1], M[3]]);
var defaultValue = 0;
var p0 = vec2.subtract(inOrig, mat2.xVec2(M, outOrig, vec2.create()), vec2.create());
var p0 = vec2.subtract(inOrig, mat2.xVec2(M, outOrig, vec2.clone()), vec2.clone());
var min_x = p0[0], min_y = p0[1];
var max_x = min_x, max_y = min_y;
@@ -94,7 +97,7 @@ define([
else
max_y += h * down[1];
var carrigeReturn = vec2.subtract(down, vec2.scale(across, w, vec2.create()), vec2.create());
var carrigeReturn = vec2.subtract(down, vec2.scale(across, w, vec2.clone()), vec2.clone());
if (min_x >= 0 && min_y >= 0 && max_x < iw - 1 && max_y < ih - 1) {
p = p0;
@@ -346,7 +349,7 @@ define([
label.theta += 180;
}
label.rad = tmp > PI ? tmp - PI : tmp;
label.vec = vec2.create([Math.cos(tmp), Math.sin(tmp)]);
label.vec = vec2.clone([Math.cos(tmp), Math.sin(tmp)]);
result.push(label);
}
}
src/quagga.js
+12 -11
View File
@@ -1,7 +1,5 @@
/* jshint undef: true, unused: true, browser:true, devel: true, evil: true */
/* global define, vec2 */
/* global define */
define([
"input_stream",
"image_wrapper",
@@ -13,6 +11,7 @@ define([
"events",
"camera_access",
"image_debug",
"gl-matrix",
"result_collector"],
function(InputStream,
ImageWrapper,
@@ -24,6 +23,7 @@ function(InputStream,
Events,
CameraAccess,
ImageDebug,
glMatrix,
ResultCollector) {
"use strict";
@@ -45,6 +45,7 @@ function(InputStream,
_decoder,
_workerPool = [],
_onUIThread = true,
vec2 = glMatrix.vec2,
_resultCollector;
function initializeData(imageWrapper) {
@@ -174,10 +175,10 @@ function(InputStream,
console.log(_inputImageWrapper.size);
_boxSize = [
vec2.create([0, 0]),
vec2.create([0, _inputImageWrapper.size.y]),
vec2.create([_inputImageWrapper.size.x, _inputImageWrapper.size.y]),
vec2.create([_inputImageWrapper.size.x, 0])
vec2.clone([0, 0]),
vec2.clone([0, _inputImageWrapper.size.y]),
vec2.clone([_inputImageWrapper.size.x, _inputImageWrapper.size.y]),
vec2.clone([_inputImageWrapper.size.x, 0])
];
BarcodeLocator.init(_inputImageWrapper, _config.locator);
}
@@ -187,10 +188,10 @@ function(InputStream,
return BarcodeLocator.locate();
} else {
return [[
vec2.create(_boxSize[0]),
vec2.create(_boxSize[1]),
vec2.create(_boxSize[2]),
vec2.create(_boxSize[3])]];
vec2.clone(_boxSize[0]),
vec2.clone(_boxSize[1]),
vec2.clone(_boxSize[2]),
vec2.clone(_boxSize[3])]];
}
}
src/vendor/almond.js
Vendored
-410
View File
@@ -1,410 +0,0 @@
/**
* almond 0.2.6 Copyright (c) 2011-2012, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/almond for details
*/
//Going sloppy to avoid 'use strict' string cost, but strict practices should
//be followed.
/*jslint sloppy: true */
/*global setTimeout: false */
var requirejs, require, define;
(function (undef) {
var main, req, makeMap, handlers,
defined = {},
waiting = {},
config = {},
defining = {},
hasOwn = Object.prototype.hasOwnProperty,
aps = [].slice;
function hasProp(obj, prop) {
return hasOwn.call(obj, prop);
}
/**
* Given a relative module name, like ./something, normalize it to
* a real name that can be mapped to a path.
* @param {String} name the relative name
* @param {String} baseName a real name that the name arg is relative
* to.
* @returns {String} normalized name
*/
function normalize(name, baseName) {
var nameParts, nameSegment, mapValue, foundMap,
foundI, foundStarMap, starI, i, j, part,
baseParts = baseName && baseName.split("/"),
map = config.map,
starMap = (map && map['*']) || {};
//Adjust any relative paths.
if (name && name.charAt(0) === ".") {
//If have a base name, try to normalize against it,
//otherwise, assume it is a top-level require that will
//be relative to baseUrl in the end.
if (baseName) {
//Convert baseName to array, and lop off the last part,
//so that . matches that "directory" and not name of the baseName's
//module. For instance, baseName of "one/two/three", maps to
//"one/two/three.js", but we want the directory, "one/two" for
//this normalization.
baseParts = baseParts.slice(0, baseParts.length - 1);
name = baseParts.concat(name.split("/"));
//start trimDots
for (i = 0; i < name.length; i += 1) {
part = name[i];
if (part === ".") {
name.splice(i, 1);
i -= 1;
} else if (part === "..") {
if (i === 1 && (name[2] === '..' || name[0] === '..')) {
//End of the line. Keep at least one non-dot
//path segment at the front so it can be mapped
//correctly to disk. Otherwise, there is likely
//no path mapping for a path starting with '..'.
//This can still fail, but catches the most reasonable
//uses of ..
break;
} else if (i > 0) {
name.splice(i - 1, 2);
i -= 2;
}
}
}
//end trimDots
name = name.join("/");
} else if (name.indexOf('./') === 0) {
// No baseName, so this is ID is resolved relative
// to baseUrl, pull off the leading dot.
name = name.substring(2);
}
}
//Apply map config if available.
if ((baseParts || starMap) && map) {
nameParts = name.split('/');
for (i = nameParts.length; i > 0; i -= 1) {
nameSegment = nameParts.slice(0, i).join("/");
if (baseParts) {
//Find the longest baseName segment match in the config.
//So, do joins on the biggest to smallest lengths of baseParts.
for (j = baseParts.length; j > 0; j -= 1) {
mapValue = map[baseParts.slice(0, j).join('/')];
//baseName segment has config, find if it has one for
//this name.
if (mapValue) {
mapValue = mapValue[nameSegment];
if (mapValue) {
//Match, update name to the new value.
foundMap = mapValue;
foundI = i;
break;
}
}
}
}
if (foundMap) {
break;
}
//Check for a star map match, but just hold on to it,
//if there is a shorter segment match later in a matching
//config, then favor over this star map.
if (!foundStarMap && starMap && starMap[nameSegment]) {
foundStarMap = starMap[nameSegment];
starI = i;
}
}
if (!foundMap && foundStarMap) {
foundMap = foundStarMap;
foundI = starI;
}
if (foundMap) {
nameParts.splice(0, foundI, foundMap);
name = nameParts.join('/');
}
}
return name;
}
function makeRequire(relName, forceSync) {
return function () {
//A version of a require function that passes a moduleName
//value for items that may need to
//look up paths relative to the moduleName
return req.apply(undef, aps.call(arguments, 0).concat([relName, forceSync]));
};
}
function makeNormalize(relName) {
return function (name) {
return normalize(name, relName);
};
}
function makeLoad(depName) {
return function (value) {
defined[depName] = value;
};
}
function callDep(name) {
if (hasProp(waiting, name)) {
var args = waiting[name];
delete waiting[name];
defining[name] = true;
main.apply(undef, args);
}
if (!hasProp(defined, name) && !hasProp(defining, name)) {
throw new Error('No ' + name);
}
return defined[name];
}
//Turns a plugin!resource to [plugin, resource]
//with the plugin being undefined if the name
//did not have a plugin prefix.
function splitPrefix(name) {
var prefix,
index = name ? name.indexOf('!') : -1;
if (index > -1) {
prefix = name.substring(0, index);
name = name.substring(index + 1, name.length);
}
return [prefix, name];
}
/**
* Makes a name map, normalizing the name, and using a plugin
* for normalization if necessary. Grabs a ref to plugin
* too, as an optimization.
*/
makeMap = function (name, relName) {
var plugin,
parts = splitPrefix(name),
prefix = parts[0];
name = parts[1];
if (prefix) {
prefix = normalize(prefix, relName);
plugin = callDep(prefix);
}
//Normalize according
if (prefix) {
if (plugin && plugin.normalize) {
name = plugin.normalize(name, makeNormalize(relName));
} else {
name = normalize(name, relName);
}
} else {
name = normalize(name, relName);
parts = splitPrefix(name);
prefix = parts[0];
name = parts[1];
if (prefix) {
plugin = callDep(prefix);
}
}
//Using ridiculous property names for space reasons
return {
f: prefix ? prefix + '!' + name : name, //fullName
n: name,
pr: prefix,
p: plugin
};
};
function makeConfig(name) {
return function () {
return (config && config.config && config.config[name]) || {};
};
}
handlers = {
require: function (name) {
return makeRequire(name);
},
exports: function (name) {
var e = defined[name];
if (typeof e !== 'undefined') {
return e;
} else {
return (defined[name] = {});
}
},
module: function (name) {
return {
id: name,
uri: '',
exports: defined[name],
config: makeConfig(name)
};
}
};
main = function (name, deps, callback, relName) {
var cjsModule, depName, ret, map, i,
args = [],
usingExports;
//Use name if no relName
relName = relName || name;
//Call the callback to define the module, if necessary.
if (typeof callback === 'function') {
//Pull out the defined dependencies and pass the ordered
//values to the callback.
//Default to [require, exports, module] if no deps
deps = !deps.length && callback.length ? ['require', 'exports', 'module'] : deps;
for (i = 0; i < deps.length; i += 1) {
map = makeMap(deps[i], relName);
depName = map.f;
//Fast path CommonJS standard dependencies.
if (depName === "require") {
args[i] = handlers.require(name);
} else if (depName === "exports") {
//CommonJS module spec 1.1
args[i] = handlers.exports(name);
usingExports = true;
} else if (depName === "module") {
//CommonJS module spec 1.1
cjsModule = args[i] = handlers.module(name);
} else if (hasProp(defined, depName) ||
hasProp(waiting, depName) ||
hasProp(defining, depName)) {
args[i] = callDep(depName);
} else if (map.p) {
map.p.load(map.n, makeRequire(relName, true), makeLoad(depName), {});
args[i] = defined[depName];
} else {
throw new Error(name + ' missing ' + depName);
}
}
ret = callback.apply(defined[name], args);
if (name) {
//If setting exports via "module" is in play,
//favor that over return value and exports. After that,
//favor a non-undefined return value over exports use.
if (cjsModule && cjsModule.exports !== undef &&
cjsModule.exports !== defined[name]) {
defined[name] = cjsModule.exports;
} else if (ret !== undef || !usingExports) {
//Use the return value from the function.
defined[name] = ret;
}
}
} else if (name) {
//May just be an object definition for the module. Only
//worry about defining if have a module name.
defined[name] = callback;
}
};
requirejs = require = req = function (deps, callback, relName, forceSync, alt) {
if (typeof deps === "string") {
if (handlers[deps]) {
//callback in this case is really relName
return handlers[deps](callback);
}
//Just return the module wanted. In this scenario, the
//deps arg is the module name, and second arg (if passed)
//is just the relName.
//Normalize module name, if it contains . or ..
return callDep(makeMap(deps, callback).f);
} else if (!deps.splice) {
//deps is a config object, not an array.
config = deps;
if (callback.splice) {
//callback is an array, which means it is a dependency list.
//Adjust args if there are dependencies
deps = callback;
callback = relName;
relName = null;
} else {
deps = undef;
}
}
//Support require(['a'])
callback = callback || function () {};
//If relName is a function, it is an errback handler,
//so remove it.
if (typeof relName === 'function') {
relName = forceSync;
forceSync = alt;
}
//Simulate async callback;
if (forceSync) {
main(undef, deps, callback, relName);
} else {
//Using a non-zero value because of concern for what old browsers
//do, and latest browsers "upgrade" to 4 if lower value is used:
//http://www.whatwg.org/specs/web-apps/current-work/multipage/timers.html#dom-windowtimers-settimeout:
//If want a value immediately, use require('id') instead -- something
//that works in almond on the global level, but not guaranteed and
//unlikely to work in other AMD implementations.
setTimeout(function () {
main(undef, deps, callback, relName);
}, 4);
}
return req;
};
/**
* Just drops the config on the floor, but returns req in case
* the config return value is used.
*/
req.config = function (cfg) {
config = cfg;
if (config.deps) {
req(config.deps, config.callback);
}
return req;
};
/**
* Expose module registry for debugging and tooling
*/
requirejs._defined = defined;
define = function (name, deps, callback) {
//This module may not have dependencies
if (!deps.splice) {
//deps is not an array, so probably means
//an object literal or factory function for
//the value. Adjust args.
callback = deps;
deps = [];
}
if (!hasProp(defined, name) && !hasProp(waiting, name)) {
waiting[name] = [name, deps, callback];
}
};
define.amd = {
jQuery: true
};
}());
src/vendor/browser_detect.js
Vendored
-121
View File
@@ -1,121 +0,0 @@
/*
* http://www.quirksmode.org/js/detect.html
*/
var BrowserDetect = {
init: function () {
this.browser = this.searchString(this.dataBrowser) || "An unknown browser";
this.version = this.searchVersion(navigator.userAgent)
|| this.searchVersion(navigator.appVersion)
|| "an unknown version";
this.OS = this.searchString(this.dataOS) || "an unknown OS";
},
searchString: function (data) {
for (var i=0;i<data.length;i++) {
var dataString = data[i].string;
var dataProp = data[i].prop;
this.versionSearchString = data[i].versionSearch || data[i].identity;
if (dataString) {
if (dataString.indexOf(data[i].subString) != -1)
return data[i].identity;
}
else if (dataProp)
return data[i].identity;
}
},
searchVersion: function (dataString) {
var index = dataString.indexOf(this.versionSearchString);
if (index == -1) return;
return parseFloat(dataString.substring(index+this.versionSearchString.length+1));
},
dataBrowser: [
{
string: navigator.userAgent,
subString: "Chrome",
identity: "Chrome"
},
{ string: navigator.userAgent,
subString: "OmniWeb",
versionSearch: "OmniWeb/",
identity: "OmniWeb"
},
{
string: navigator.vendor,
subString: "Apple",
identity: "Safari",
versionSearch: "Version"
},
{
prop: window.opera,
identity: "Opera",
versionSearch: "Version"
},
{
string: navigator.vendor,
subString: "iCab",
identity: "iCab"
},
{
string: navigator.vendor,
subString: "KDE",
identity: "Konqueror"
},
{
string: navigator.userAgent,
subString: "Firefox",
identity: "Firefox"
},
{
string: navigator.vendor,
subString: "Camino",
identity: "Camino"
},
{ // for newer Netscapes (6+)
string: navigator.userAgent,
subString: "Netscape",
identity: "Netscape"
},
{
string: navigator.userAgent,
subString: "MSIE",
identity: "Explorer",
versionSearch: "MSIE"
},
{
string: navigator.userAgent,
subString: "Gecko",
identity: "Mozilla",
versionSearch: "rv"
},
{ // for older Netscapes (4-)
string: navigator.userAgent,
subString: "Mozilla",
identity: "Netscape",
versionSearch: "Mozilla"
}
],
dataOS : [
{
string: navigator.platform,
subString: "Win",
identity: "Windows"
},
{
string: navigator.platform,
subString: "Mac",
identity: "Mac"
},
{
string: navigator.userAgent,
subString: "iPhone",
identity: "iPhone/iPod"
},
{
string: navigator.platform,
subString: "Linux",
identity: "Linux"
}
]
};
BrowserDetect.init();
src/vendor/glMatrix.js
Vendored
-1850
View File
File diff suppressed because it is too large Load Diff
src/vendor/r.js
Vendored
-27811
View File
File diff suppressed because one or more lines are too long
src/vendor/require.js
Vendored
-2053
View File
File diff suppressed because it is too large Load Diff
test-main.js
+1 -1
View File
@@ -18,7 +18,6 @@ require.config({
'array_helper': 'src/array_helper',
'cv_utils': 'src/cv_utils',
'typedefs': 'src/typedefs',
'glMatrixAddon': 'src/glMatrixAddon',
'cluster': 'src/cluster',
'camera_access': 'src/camera_access',
'events': 'src/events',
@@ -47,6 +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-min',
'result_collector': 'src/result_collector',
'i2of5_reader': 'src/i2of5_reader'
},