mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Oops, another code typo fix

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@223 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2008-02-22 19:13:15 +00:00
parent e8553801b1
commit 5d8e64fdbf
1 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
core/src/com/google/zxing/oned/Code39Reader.java
View file

@ -38,9 +38,9 @@ public final class Code39Reader extends AbstractOneDReader {
* with 1s representing "wide" and 0s representing narrow. * with 1s representing "wide" and 0s representing narrow.
*/ */
private static final int[] CHARACTER_ENCODINGS = { private static final int[] CHARACTER_ENCODINGS = {
0x038, 0x121, 0x061, 0x160, 0x031, 0x130, 0x070, 0x025, 0x124, 0x064, // 0-9 0x034, 0x121, 0x061, 0x160, 0x031, 0x130, 0x070, 0x025, 0x124, 0x064, // 0-9
0x109, 0x049, 0x148, 0x019, 0x118, 0x058, 0x00D, 0x10C, 0x04C, 0x01C, // A-J 0x109, 0x049, 0x148, 0x019, 0x118, 0x058, 0x00D, 0x10C, 0x04C, 0x01C, // A-J
0x103, 0x043, 0x142, 0x013, 0x112, 0x052, 0x007, 0x106, 0x046, 0x016, // K-T 0x103, 0x043, 0x142, 0x013, 0x112, 0x052, 0x007, 0x106, 0x046, 0x016, // K-T
0x181, 0x0C1, 0x1C0, 0x091, 0x190, 0x0D0, 0x085, 0x184, 0x0C4, 0x094, // U-* 0x181, 0x0C1, 0x1C0, 0x091, 0x190, 0x0D0, 0x085, 0x184, 0x0C4, 0x094, // U-*
0x0A8, 0x0A2, 0x08A, 0x02A // $-% 0x0A8, 0x0A2, 0x08A, 0x02A // $-%
}; };
@ -174,6 +174,8 @@ public final class Code39Reader extends AbstractOneDReader {
for (int y = 2; y < patternLength; y++) { for (int y = 2; y < patternLength; y++) {
counters[y - 2] = counters[y]; counters[y - 2] = counters[y];
} }
counters[patternLength - 2] = 0;
counters[patternLength - 1] = 0;
counterPosition--; counterPosition--;
} else { } else {
counterPosition++; counterPosition++;
@ -186,25 +188,31 @@ public final class Code39Reader extends AbstractOneDReader {
} }
private static int toNarrowWidePattern(int[] counters) throws ReaderException { private static int toNarrowWidePattern(int[] counters) throws ReaderException {
int minCounter = Integer.MAX_VALUE; int numCounters = counters.length;
for (int i = 0; i < counters.length; i++) { int maxNarrowCounter = 0;
if (counters[i] < minCounter) { int wideCounters;
minCounter = counters[i]; do {
int minCounter = Integer.MAX_VALUE;
for (int i = 0; i < numCounters; i++) {
int counter = counters[i];
if (counter < minCounter && counter > maxNarrowCounter) {
minCounter = counter;
}
} }
} maxNarrowCounter = minCounter;
int maxNarrowCounter = (int) (minCounter * 1.5f); wideCounters = 0;
int wideCounters = 0; int pattern = 0;
int pattern = 0; for (int i = 0; i < numCounters; i++) {
for (int i = 0; i < counters.length; i++) { if (counters[i] > maxNarrowCounter) {
if (counters[i] > maxNarrowCounter) { pattern |= 1 << (numCounters - 1 - i);
pattern |= 1 << (counters.length - 1 - i); wideCounters++;
wideCounters++; }
} }
} if (wideCounters == 3) {
if (wideCounters != 3) { return pattern;
throw new ReaderException("Can't find 3 wide bars/spaces out of 9"); }
} } while (wideCounters > 3);
return pattern; throw new ReaderException("Can't find 3 wide bars/spaces out of 9");
} }
private static char patternToChar(int pattern) throws ReaderException { private static char patternToChar(int pattern) throws ReaderException {