Skip to content

Commit 79356dc

Browse files
author
Christoph Oberhofer
committed
Fixes Code 39 decoding where parts of the results are skipped. Relates to #41
1 parent 7a3fc1e commit 79356dc

File tree

9 files changed

+20
-12
lines changed

9 files changed

+20
-12
lines changed

README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
quaggaJS
22
========
33

4-
- [Changelog](#changelog) (2015-10-13)
4+
- [Changelog](#changelog) (2015-11-15)
55

66
## What is QuaggaJS?
77

@@ -434,6 +434,12 @@ on the ``singleChannel`` flag in the configuration when using ``decodeSingle``.
434434

435435
## <a name="changelog">Changelog</a>
436436

437+
### 2015-11-15
438+
439+
- Fixes
440+
- Fixed inconsistency in Code 39 decoding
441+
- added inline-source-map to quagga.js file
442+
437443
### 2015-10-13
438444
Take a look at the release-notes ([0.8.0]
439445
(https://github.com/serratus/quaggaJS/releases/tag/v0.8.0))

dist/quagga.js

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/quagga.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/live_w_locator.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ <h3>The user's camera</h3>
9494
</p>
9595
</footer>
9696

97-
<script src="../src/vendor/jquery-1.9.0.min.js" type="text/javascript"></script>
97+
<script src="vendor/jquery-1.9.0.min.js" type="text/javascript"></script>
9898
<script src="../dist/quagga.js" type="text/javascript"></script>
9999
<script src="live_w_locator.js" type="text/javascript"></script>
100100
</body>

lib/quagga.js

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"babel-core": "^5.8.25",
1010
"babel-eslint": "^4.1.3",
1111
"babel-loader": "^5.3.2",
12-
"chai": "^3.2.0",
12+
"chai": "^1.10.0",
1313
"core-js": "^1.2.1",
1414
"grunt": "^0.4.5",
1515
"grunt-contrib-jshint": "^0.11.3",
@@ -30,6 +30,7 @@
3030
"karma-source-map-support": "^1.1.0",
3131
"karma-webpack": "^1.7.0",
3232
"mocha": "^2.3.2",
33+
"phantomjs": "^1.9.18",
3334
"sinon": "^1.16.1",
3435
"webpack": "^1.12.2"
3536
},

plugins/umd.js

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ MyUmdPlugin.prototype.apply = function(compiler) {
1010
var mainTemplate = compilation.mainTemplate;
1111
compilation.templatesPlugin("render-with-entry", function(source, chunk, hash) {
1212

13-
var amdFactory = "factory";
1413
return new ConcatSource(new OriginalSource(
1514
"(function webpackUniversalModuleDefinition(root, factory) {\n" +
1615
" if(typeof exports === 'object' && typeof module === 'object')\n" +

src/code_39_reader.js

+1
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ Code39Reader.prototype._patternToChar = function(pattern) {
116116
return String.fromCharCode(self.ALPHABET[i]);
117117
}
118118
}
119+
return -1;
119120
};
120121

121122
Code39Reader.prototype._findNextWidth = function(counters, current) {

webpack.config.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
entry: [
77
'./src/quagga.js'
88
],
9-
devtool: 'source-map',
9+
devtool: 'inline-source-map',
1010
module: {
1111
loaders: [{
1212
test: /\.jsx?$/,
@@ -24,8 +24,7 @@ module.exports = {
2424
output: {
2525
path: __dirname + '/dist',
2626
publicPath: '/',
27-
filename: 'quagga.js',
28-
sourceMapFilename: 'quagga.map'
27+
filename: 'quagga.js'
2928
},
3029
devServer: {
3130
contentBase: './',

0 commit comments

Comments
 (0)