[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809
bas5winkel at gmail.com
bas5winkel at gmail.com
Wed Aug 4 01:31:48 UTC 2010
The following commit has been merged in the upstream branch:
commit 521744103d4308512ffba37a62fa37ae2e1bc493
Author: bas5winkel at gmail.com <bas5winkel at gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Mon May 31 12:18:49 2010 +0000
Added support for codabar format
git-svn-id: http://zxing.googlecode.com/svn/trunk@1399 59b500cc-1b3d-0410-9834-0bbf25fbcc57
diff --git a/core/src/com/google/zxing/BarcodeFormat.java b/core/src/com/google/zxing/BarcodeFormat.java
index aa4096a..032a1b6 100644
--- a/core/src/com/google/zxing/BarcodeFormat.java
+++ b/core/src/com/google/zxing/BarcodeFormat.java
@@ -54,7 +54,10 @@ public final class BarcodeFormat {
public static final BarcodeFormat CODE_39 = new BarcodeFormat("CODE_39");
/** Code 93 1D format. */
- public static final BarcodeFormat CODE_93 = new BarcodeFormat("CODE_93");
+ public static final BarcodeFormat CODE_93 = new BarcodeFormat("CODE_93");
+
+ /** CODABAR 1D format. */
+ public static final BarcodeFormat CODABAR = new BarcodeFormat("CODABAR");
/** ITF (Interleaved Two of Five) 1D format. */
public static final BarcodeFormat ITF = new BarcodeFormat("ITF");
diff --git a/core/src/com/google/zxing/MultiFormatReader.java b/core/src/com/google/zxing/MultiFormatReader.java
index 0e70341..aab25ff 100644
--- a/core/src/com/google/zxing/MultiFormatReader.java
+++ b/core/src/com/google/zxing/MultiFormatReader.java
@@ -99,6 +99,7 @@ public final class MultiFormatReader implements Reader {
formats.contains(BarcodeFormat.UPC_E) ||
formats.contains(BarcodeFormat.EAN_13) ||
formats.contains(BarcodeFormat.EAN_8) ||
+ formats.contains(BarcodeFormat.CODABAR) ||
formats.contains(BarcodeFormat.CODE_39) ||
formats.contains(BarcodeFormat.CODE_93) ||
formats.contains(BarcodeFormat.CODE_128) ||
diff --git a/core/src/com/google/zxing/oned/CodaBarReader.java b/core/src/com/google/zxing/oned/CodaBarReader.java
new file mode 100644
index 0000000..ff677cb
--- /dev/null
+++ b/core/src/com/google/zxing/oned/CodaBarReader.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.oned;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.FormatException;
+import com.google.zxing.NotFoundException;
+import com.google.zxing.Result;
+import com.google.zxing.ResultPoint;
+import com.google.zxing.common.BitArray;
+import java.util.Hashtable;
+
+/**
+ * <p>Decodes Codabar barcodes. </p>
+ *
+ * @author Bas Vijfwinkel
+ */
+public final class CodaBarReader extends OneDReader {
+
+ private static final String ALPHABET_STRING = "0123456789-$:/.+ABCDTN";
+ private static final char[] ALPHABET = ALPHABET_STRING.toCharArray();
+
+ /**
+ * These represent the encodings of characters, as patterns of wide and narrow bars.
+ * The 7 least-significant bits of each int correspond to the pattern of wide and narrow,
+ * with 1s representing "wide" and 0s representing narrow.
+ * NOTE : c is equal to the * pattern
+ * NOTE : d is equal to the e pattern
+ */
+
+ private static final int[] CHARACTER_ENCODINGS = {
+ 0x003, 0x006, 0x009, 0x060, 0x012, 0x042, 0x021, 0x024, 0x030, 0x048, // 0-9
+ 0x00c, 0x018, 0x025, 0x051, 0x054, 0x015, 0x01A, 0x029, 0x00B, 0x00E, // -$:/.+ABCD
+ 0x01A,0x029 //TN
+ };
+
+ // multiple start/end patterns
+ // official start and end patterns
+ //private static final char[] STARTEND_ENCODING = {'$','A','B','C','D','T','N','+'};
+ // some codabar generator allow the codabar string to be closed by every character
+ private static final char[] STARTEND_ENCODING = {'0','1','2','3','4','5','6','7','8','9','-','$',':','/','.','+','A','B','C','D','T','N'};
+
+ public CodaBarReader()
+ {
+ }
+
+
+ public Result decodeRow(int rowNumber, BitArray row, Hashtable hints) throws FormatException, NotFoundException
+ {
+ int[] start;
+ start = findAsteriskPattern(row);
+ start[1] = 0; // BAS: settings this to 0 improves the recognition rate somehow?
+ int nextStart = start[1];
+ int end = row.getSize();
+
+ // Read off white space
+ while (nextStart < end && !row.get(nextStart))
+ {
+ nextStart++;
+ }
+
+ StringBuffer result = new StringBuffer();
+ //int[] counters = new int[7];
+ int[] counters;
+ char decodedChar;
+ int lastStart;
+
+ do
+ {
+ counters = new int[] {0,0,0,0,0,0,0} ; // reset counters
+ recordPattern(row, nextStart, counters);
+
+ decodedChar = toNarrowWidePattern(counters);
+ if (decodedChar == '!')
+ {
+ throw NotFoundException.getNotFoundInstance();
+ }
+ result.append(decodedChar);
+ lastStart = nextStart;
+ for (int i = 0; i < counters.length; i++)
+ {
+ nextStart += counters[i];
+ }
+
+ // Read off white space
+ while (nextStart < end && !row.get(nextStart))
+ {
+ nextStart++;
+ }
+ } while (nextStart < end); // no fixed end pattern so keep on reading while data is available
+
+ // find last character in STARTEND_ENCODING
+ for (int k = result.length()-1;k >= 0;k--)
+ {
+ if (arrayContains(STARTEND_ENCODING,result.charAt(k)))
+ {
+ // valid character -> remove and break out of loop
+ result.deleteCharAt(k);
+ k=-1;// break out of loop
+ }
+ else
+ {
+ // not a valid character -> remove anyway
+ result.deleteCharAt(k);
+ }
+ }
+
+
+ // remove first character
+ if (result.length() > 0) {result.deleteCharAt(0);}
+
+ // Look for whitespace after pattern:
+ int lastPatternSize = 0;
+ for (int i = 0; i < counters.length; i++)
+ {
+ lastPatternSize += counters[i];
+ }
+ int whiteSpaceAfterEnd = nextStart - lastStart - lastPatternSize;
+ // If 50% of last pattern size, following last pattern, is not whitespace, fail
+ // (but if it's whitespace to the very end of the image, that's OK)
+ if ((nextStart) != end && (whiteSpaceAfterEnd / 2 < lastPatternSize))
+ {
+ throw NotFoundException.getNotFoundInstance();
+ }
+
+
+ String resultString = result.toString();
+ if (resultString.length() == 0)
+ {
+ // Almost surely a false positive
+ throw NotFoundException.getNotFoundInstance();
+ }
+
+ float left = (float) (start[1] + start[0]) / 2.0f;
+ float right = (float) (nextStart + lastStart) / 2.0f;
+ return new Result(
+ resultString,
+ null,
+ new ResultPoint[]{
+ new ResultPoint(left, (float) rowNumber),
+ new ResultPoint(right, (float) rowNumber)},
+ BarcodeFormat.CODABAR);
+ }
+
+ private static int[] findAsteriskPattern(BitArray row) throws NotFoundException {
+ int width = row.getSize();
+ int rowOffset = 0;
+ while (rowOffset < width) {
+ if (row.get(rowOffset)) {
+ break;
+ }
+ rowOffset++;
+ }
+
+ int counterPosition = 0;
+ int[] counters = new int[7];
+ int patternStart = rowOffset;
+ boolean isWhite = false;
+ int patternLength = counters.length;
+
+ for (int i = rowOffset; i < width; i++) {
+ boolean pixel = row.get(i);
+ if (pixel ^ isWhite) {
+ counters[counterPosition]++;
+ } else {
+ if (counterPosition == patternLength - 1) {
+ try {
+ if (arrayContains(STARTEND_ENCODING,toNarrowWidePattern(counters)))
+ {
+ // Look for whitespace before start pattern, >= 50% of width of start pattern
+ if (row.isRange(Math.max(0, patternStart - (i - patternStart) / 2), patternStart, false)) {
+ return new int[]{patternStart, i};
+ }
+ }
+ } catch (IllegalArgumentException re) {
+ // no match, continue
+ }
+ patternStart += counters[0] + counters[1];
+ for (int y = 2; y < patternLength; y++) {
+ counters[y - 2] = counters[y];
+ }
+ counters[patternLength - 2] = 0;
+ counters[patternLength - 1] = 0;
+ counterPosition--;
+ } else {
+ counterPosition++;
+ }
+ counters[counterPosition] = 1;
+ isWhite ^= true; // isWhite = !isWhite;
+ }
+ }
+ throw NotFoundException.getNotFoundInstance();
+ }
+
+ private static boolean arrayContains(char[] array, char key)
+ {
+ if (array != null)
+ {
+ for (int i=0;i<array.length;i++)
+ {
+ if (array[i] == key) { return true; }
+ }
+ }
+ return false;
+ }
+
+ private static char toNarrowWidePattern(int[] counters) {
+ // BAS : I have changed the following part because some codabar images would fail with the original routine
+ // I took from the Code39Reader.java file
+ // ----------- change start
+ int numCounters = counters.length;
+ int maxNarrowCounter = 0;
+ int wideCounters;
+
+ int minCounter = Integer.MAX_VALUE;
+ for (int i = 0; i < numCounters; i++)
+ {
+ if (counters[i] < minCounter) { minCounter = counters[i]; }
+ if (counters[i] > maxNarrowCounter) { maxNarrowCounter = counters[i]; }
+ }
+ // ---------- change end
+
+
+ do
+ {
+ wideCounters = 0;
+ int totalWideCountersWidth = 0;
+ int pattern = 0;
+ for (int i = 0; i < numCounters; i++) {
+ int counter = counters[i];
+ if (counters[i] > maxNarrowCounter) {
+ pattern |= 1 << (numCounters - 1 - i);
+ wideCounters++;
+ totalWideCountersWidth += counter;
+ }
+ }
+
+ if ((wideCounters == 2) || (wideCounters == 3))
+ {
+ for (int i = 0; i < CHARACTER_ENCODINGS.length; i++)
+ {
+ if (CHARACTER_ENCODINGS[i] == pattern)
+ {
+ return ALPHABET[i];
+ }
+ }
+ }
+ maxNarrowCounter--;
+ } while (maxNarrowCounter > minCounter);
+ return '!';
+ }
+
+}
diff --git a/core/src/com/google/zxing/oned/MultiFormatOneDReader.java b/core/src/com/google/zxing/oned/MultiFormatOneDReader.java
index 2e3126f..f92af71 100644
--- a/core/src/com/google/zxing/oned/MultiFormatOneDReader.java
+++ b/core/src/com/google/zxing/oned/MultiFormatOneDReader.java
@@ -62,6 +62,10 @@ public final class MultiFormatOneDReader extends OneDReader {
if (possibleFormats.contains(BarcodeFormat.ITF)) {
readers.addElement(new ITFReader());
}
+ if (possibleFormats.contains(BarcodeFormat.CODABAR)) {
+ readers.addElement(new CodaBarReader());
+ }
+
if (possibleFormats.contains(BarcodeFormat.RSS14)) {
readers.addElement(new RSS14Reader());
}
@@ -72,6 +76,7 @@ public final class MultiFormatOneDReader extends OneDReader {
if (readers.isEmpty()) {
readers.addElement(new MultiFormatUPCEANReader(hints));
readers.addElement(new Code39Reader());
+ readers.addElement(new CodaBarReader());
readers.addElement(new Code93Reader());
readers.addElement(new Code128Reader());
readers.addElement(new ITFReader());
--
Multi-format 1D/2D barcode image processing library
More information about the Pkg-google-commits
mailing list