Added EAN-8 Reader

dist/quagga.js

@@ -1273,13 +1273,50 @@ define(
             return null;
         };
 
+        EANReader.prototype._decodePayload = function(code, result, decodedCodes) {
+            var i,
+                self = this,
+                codeFrequency = 0x0;
+
+            for ( i = 0; i < 6; i++) {
+                code = self._decodeCode(code.end);
+                if (code.code >= self.CODE_G_START) {
+                    code.code = code.code - self.CODE_G_START;
+                    codeFrequency |= 1 << (5 - i);
+                } else {
+                    codeFrequency |= 0 << (5 - i);
+                }
+                result.push(code.code);
+                decodedCodes.push(code);
+            }
+
+            for ( i = 0; i < self.CODE_FREQUENCY.length; i++) {
+                if (codeFrequency === self.CODE_FREQUENCY[i]) {
+                    result.unshift(i);
+                    break;
+                }
+            }
+
+            code = self._findPattern(self.MIDDLE_PATTERN, code.end, true);
+            if (code === null) {
+                return null;
+            }
+            decodedCodes.push(code);
+
+            for ( i = 0; i < 6; i++) {
+                code = self._decodeCode(code.end, self.CODE_G_START);
+                decodedCodes.push(code);
+                result.push(code.code);
+            }
+
+            return code;
+        };
+
         EANReader.prototype._decode = function() {
             var startInfo,
                 self = this,
                 code = null, 
                 result = [],
-                i,
-                codeFrequency = 0x0,
                 decodedCodes = [];
 
             try {
@@ -1290,37 +1327,7 @@ define(
                     end : startInfo.end
                 };
                 decodedCodes.push(code);
-                for ( i = 0; i < 6; i++) {
-                    code = self._decodeCode(code.end);
-                    if (code.code >= self.CODE_G_START) {
-                        code.code = code.code - self.CODE_G_START;
-                        codeFrequency |= 1 << (5 - i);
-                    } else {
-                        codeFrequency |= 0 << (5 - i);
-                    }
-                    result.push(code.code);
-                    decodedCodes.push(code);
-                }
-
-                for ( i = 0; i < self.CODE_FREQUENCY.length; i++) {
-                    if (codeFrequency === self.CODE_FREQUENCY[i]) {
-                        result.unshift(i);
-                        break;
-                    }
-                }
-
-                code = self._findPattern(self.MIDDLE_PATTERN, code.end, true);
-                if (code === null) {
-                    return null;
-                }
-                decodedCodes.push(code);
-
-                for ( i = 0; i < 6; i++) {
-                    code = self._decodeCode(code.end, self.CODE_G_START);
-                    decodedCodes.push(code);
-                    result.push(code.code);
-                }
-
+                code = self._decodePayload(code, result, decodedCodes);
                 code = self._findEnd(code.end);
                 if (code === null){
                     return null;
@@ -7063,12 +7070,75 @@ define(
 /* jshint undef: true, unused: true, browser:true, devel: true */
 /* global define */
 
-define('barcode_decoder',["bresenham", "image_debug", 'code_128_reader', 'ean_reader', 'code_39_reader', 'codabar_reader', 'upc_reader'], function(Bresenham, ImageDebug, Code128Reader, EANReader, Code39Reader, CodabarReader, UPCReader) {
+define(
+    'ean_8_reader',[
+        "./ean_reader"
+    ],
+    function(EANReader) {
+        
+
+        function EAN8Reader() {
+            EANReader.call(this);
+        }
+
+        EAN8Reader.prototype = Object.create(EANReader.prototype);
+        EAN8Reader.prototype.constructor = EAN8Reader;
+
+        EAN8Reader.prototype._decodePayload = function(code, result, decodedCodes) {
+            var i,
+                self = this;
+
+            for ( i = 0; i < 4; i++) {
+                code = self._decodeCode(code.end);
+                result.push(code.code);
+                decodedCodes.push(code);
+            }
+
+            code = self._findPattern(self.MIDDLE_PATTERN, code.end, true);
+            if (code === null) {
+                return null;
+            }
+            decodedCodes.push(code);
+
+            for ( i = 0; i < 4; i++) {
+                code = self._decodeCode(code.end, self.CODE_G_START);
+                decodedCodes.push(code);
+                result.push(code.code);
+            }
+
+            return code;
+        };
+
+        return (EAN8Reader);
+    }
+);
+/* jshint undef: true, unused: true, browser:true, devel: true */
+/* global define */
+
+define('barcode_decoder',[
+    "bresenham",
+    "image_debug",
+    'code_128_reader',
+    'ean_reader',
+    'code_39_reader',
+    'codabar_reader',
+    'upc_reader',
+    'ean_8_reader'
+], function(
+    Bresenham,
+    ImageDebug,
+    Code128Reader,
+    EANReader,
+    Code39Reader,
+    CodabarReader,
+    UPCReader,
+    EAN8Reader) {
     
     
     var readers = {
         code_128_reader: Code128Reader,
         ean_reader: EANReader,
+        ean_8_reader: EAN8Reader,
         code_39_reader: Code39Reader,
         codabar_reader: CodabarReader,
         upc_reader: UPCReader

example/file_input.html

@@ -44,7 +44,9 @@
                 <select name="decoder_readers">
                     <option value="code_128">Code 128</option>
                     <option value="code_39">Code 39</option>
-                    <option value="ean" selected="selected">EAN</option>
+                    <option value="ean">EAN</option>
+                    <option value="ean_8" selected="selected">EAN-8</option>
+                    <option value="upc">UPC</option>
                     <option value="codabar">Codabar</option>
                 </select>
             </label>

example/file_input.js

@@ -99,7 +99,7 @@ $(function() {
             },
             numOfWorkers: 0,
             decoder: {
-                readers: ["ean_reader"],
+                readers: ["ean_8_reader"],
                 showFrequency: true,
                 showPattern: true
             },

example/live_w_locator.html

@@ -29,8 +29,10 @@
       <div class="controls">
         <button class="stop">Stop</button>
         <fieldset class="reader-group">
+            <label>EAN-8</label>
+            <input type="radio" name="reader" value="ean_8" checked />
             <label>UPC</label>
-            <input type="radio" name="reader" value="upc" checked />
+            <input type="radio" name="reader" value="upc" />
             <label>Code39</label>
             <input type="radio" name="reader" value="codabar" />
             <label>Code128</label>
@@ -54,7 +56,7 @@
       </footer>
     
     <script src="../src/vendor/jquery-1.9.0.min.js" type="text/javascript"></script>
-    <script src="../dist/quagga.min.js" type="text/javascript"></script>
+    <script src="../dist/quagga.js" type="text/javascript"></script>
     <script src="live_w_locator.js" type="text/javascript"></script>
   </body>
 </html>

example/live_w_locator.js

@@ -7,7 +7,7 @@ $(function() {
                     type : "LiveStream"
                 },
                 decoder : {
-                    readers : ["upc_reader"]
+                    readers : ["ean_8_reader"]
                 }
             }, function() {
                 App.attachListeners();

src/barcode_decoder.js

@@ -1,12 +1,30 @@
 /* jshint undef: true, unused: true, browser:true, devel: true */
 /* global define */
 
-define(["bresenham", "image_debug", 'code_128_reader', 'ean_reader', 'code_39_reader', 'codabar_reader', 'upc_reader'], function(Bresenham, ImageDebug, Code128Reader, EANReader, Code39Reader, CodabarReader, UPCReader) {
+define([
+    "bresenham",
+    "image_debug",
+    'code_128_reader',
+    'ean_reader',
+    'code_39_reader',
+    'codabar_reader',
+    'upc_reader',
+    'ean_8_reader'
+], function(
+    Bresenham,
+    ImageDebug,
+    Code128Reader,
+    EANReader,
+    Code39Reader,
+    CodabarReader,
+    UPCReader,
+    EAN8Reader) {
     "use strict";
     
     var readers = {
         code_128_reader: Code128Reader,
         ean_reader: EANReader,
+        ean_8_reader: EAN8Reader,
         code_39_reader: Code39Reader,
         codabar_reader: CodabarReader,
         upc_reader: UPCReader

src/ean_8_reader.js

@@ -0,0 +1,45 @@
+/* jshint undef: true, unused: true, browser:true, devel: true */
+/* global define */
+
+define(
+    [
+        "./ean_reader"
+    ],
+    function(EANReader) {
+        "use strict";
+
+        function EAN8Reader() {
+            EANReader.call(this);
+        }
+
+        EAN8Reader.prototype = Object.create(EANReader.prototype);
+        EAN8Reader.prototype.constructor = EAN8Reader;
+
+        EAN8Reader.prototype._decodePayload = function(code, result, decodedCodes) {
+            var i,
+                self = this;
+
+            for ( i = 0; i < 4; i++) {
+                code = self._decodeCode(code.end);
+                result.push(code.code);
+                decodedCodes.push(code);
+            }
+
+            code = self._findPattern(self.MIDDLE_PATTERN, code.end, true);
+            if (code === null) {
+                return null;
+            }
+            decodedCodes.push(code);
+
+            for ( i = 0; i < 4; i++) {
+                code = self._decodeCode(code.end, self.CODE_G_START);
+                decodedCodes.push(code);
+                result.push(code.code);
+            }
+
+            return code;
+        };
+
+        return (EAN8Reader);
+    }
+);

src/ean_reader.js

@@ -200,13 +200,50 @@ define(
             return null;
         };
 
+        EANReader.prototype._decodePayload = function(code, result, decodedCodes) {
+            var i,
+                self = this,
+                codeFrequency = 0x0;
+
+            for ( i = 0; i < 6; i++) {
+                code = self._decodeCode(code.end);
+                if (code.code >= self.CODE_G_START) {
+                    code.code = code.code - self.CODE_G_START;
+                    codeFrequency |= 1 << (5 - i);
+                } else {
+                    codeFrequency |= 0 << (5 - i);
+                }
+                result.push(code.code);
+                decodedCodes.push(code);
+            }
+
+            for ( i = 0; i < self.CODE_FREQUENCY.length; i++) {
+                if (codeFrequency === self.CODE_FREQUENCY[i]) {
+                    result.unshift(i);
+                    break;
+                }
+            }
+
+            code = self._findPattern(self.MIDDLE_PATTERN, code.end, true);
+            if (code === null) {
+                return null;
+            }
+            decodedCodes.push(code);
+
+            for ( i = 0; i < 6; i++) {
+                code = self._decodeCode(code.end, self.CODE_G_START);
+                decodedCodes.push(code);
+                result.push(code.code);
+            }
+
+            return code;
+        };
+
         EANReader.prototype._decode = function() {
             var startInfo,
                 self = this,
                 code = null, 
                 result = [],
-                i,
-                codeFrequency = 0x0,
                 decodedCodes = [];
 
             try {
@@ -217,37 +254,7 @@ define(
                     end : startInfo.end
                 };
                 decodedCodes.push(code);
-                for ( i = 0; i < 6; i++) {
-                    code = self._decodeCode(code.end);
-                    if (code.code >= self.CODE_G_START) {
-                        code.code = code.code - self.CODE_G_START;
-                        codeFrequency |= 1 << (5 - i);
-                    } else {
-                        codeFrequency |= 0 << (5 - i);
-                    }
-                    result.push(code.code);
-                    decodedCodes.push(code);
-                }
-
-                for ( i = 0; i < self.CODE_FREQUENCY.length; i++) {
-                    if (codeFrequency === self.CODE_FREQUENCY[i]) {
-                        result.unshift(i);
-                        break;
-                    }
-                }
-
-                code = self._findPattern(self.MIDDLE_PATTERN, code.end, true);
-                if (code === null) {
-                    return null;
-                }
-                decodedCodes.push(code);
-
-                for ( i = 0; i < 6; i++) {
-                    code = self._decodeCode(code.end, self.CODE_G_START);
-                    decodedCodes.push(code);
-                    result.push(code.code);
-                }
-
+                code = self._decodePayload(code, result, decodedCodes);
                 code = self._findEnd(code.end);
                 if (code === null){
                     return null;