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 Packages Projects Releases Wiki Activity

Another fix -- account for CODE_STOP. Add some comments.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@585 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2008-09-22 09:08:57 +00:00
parent b29b4d2070
commit e2b141e1a3
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/src/com/google/zxing/oned/Code128Reader.java
View file

@ -268,18 +268,25 @@ public final class Code128Reader extends AbstractOneDReader {
while (!done) { while (!done) {
// Remember whether the last code was printable or not (excluding CODE_STOP)
lastCharacterWasPrintable = true; lastCharacterWasPrintable = true;
boolean unshift = isNextShifted; boolean unshift = isNextShifted;
isNextShifted = false; isNextShifted = false;
// Save off last code
lastCode = code; lastCode = code;
// Decode another code from image
code = decodeCode(row, counters, nextStart); code = decodeCode(row, counters, nextStart);
// Add to checksum computation (if not CODE_STOP of course)
if (code != CODE_STOP) { if (code != CODE_STOP) {
multiplier++; multiplier++;
checksumTotal += multiplier * code; checksumTotal += multiplier * code;
} }
// Advance to where the next code will to start
lastStart = nextStart; lastStart = nextStart;
for (int i = 0; i < counters.length; i++) { for (int i = 0; i < counters.length; i++) {
nextStart += counters[i]; nextStart += counters[i];
@ -301,7 +308,11 @@ public final class Code128Reader extends AbstractOneDReader {
} else if (code < 96) { } else if (code < 96) {
result.append((char) (code - 64)); result.append((char) (code - 64));
} else { } else {
// Don't let CODE_STOP, which always appears, affect whether whether we think the last code
// was printable or not
if (code != CODE_STOP) {
lastCharacterWasPrintable = false; lastCharacterWasPrintable = false;
}
switch (code) { switch (code) {
case CODE_FNC_1: case CODE_FNC_1:
case CODE_FNC_2: case CODE_FNC_2:
@ -329,7 +340,9 @@ public final class Code128Reader extends AbstractOneDReader {
if (code < 96) { if (code < 96) {
result.append((char) (' ' + code)); result.append((char) (' ' + code));
} else { } else {
if (code != CODE_STOP) {
lastCharacterWasPrintable = false; lastCharacterWasPrintable = false;
}
switch (code) { switch (code) {
case CODE_FNC_1: case CODE_FNC_1:
case CODE_FNC_2: case CODE_FNC_2:
@ -360,7 +373,9 @@ public final class Code128Reader extends AbstractOneDReader {
} }
result.append(code); result.append(code);
} else { } else {
if (code != CODE_STOP) {
lastCharacterWasPrintable = false; lastCharacterWasPrintable = false;
}
switch (code) { switch (code) {
case CODE_FNC_1: case CODE_FNC_1:
// do nothing? // do nothing?
@ -379,6 +394,7 @@ public final class Code128Reader extends AbstractOneDReader {
break; break;
} }
// Unshift back to another code set if we were shifted
if (unshift) { if (unshift) {
switch (codeSet) { switch (codeSet) {
case CODE_CODE_A: case CODE_CODE_A:
@ -397,12 +413,15 @@ public final class Code128Reader extends AbstractOneDReader {
// Pull out from sum the value of the penultimate check code // Pull out from sum the value of the penultimate check code
checksumTotal -= multiplier * lastCode; checksumTotal -= multiplier * lastCode;
// lastCode is the checksum then:
if (checksumTotal % 103 != lastCode) { if (checksumTotal % 103 != lastCode) {
throw new ReaderException("Checksum failed"); throw new ReaderException("Checksum failed");
} }
// Need to pull out the check digits from string // Need to pull out the check digits from string
int resultLength = result.length(); int resultLength = result.length();
// Only bother if, well, the result had at least one character, and if the checksum digit happened
// to be a printable character. If it was just interpreted as a control code, nothing to remove
if (resultLength > 0 && lastCharacterWasPrintable) { if (resultLength > 0 && lastCharacterWasPrintable) {
if (codeSet == CODE_CODE_C) { if (codeSet == CODE_CODE_C) {
result.delete(resultLength - 2, resultLength); result.delete(resultLength - 2, resultLength);