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

Fix bug that would cut out part of result string if final checksum value happened to be the code for a non-printable character

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@584 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2008-09-21 11:14:48 +00:00
parent e57cf71874
commit b29b4d2070
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -264,9 +264,12 @@ public final class Code128Reader extends AbstractOneDReader {
int code = 0; int code = 0;
int checksumTotal = startCode; int checksumTotal = startCode;
int multiplier = 0; int multiplier = 0;
boolean lastCharacterWasPrintable = true;
while (!done) { while (!done) {
lastCharacterWasPrintable = true;
boolean unshift = isNextShifted; boolean unshift = isNextShifted;
isNextShifted = false; isNextShifted = false;
@ -298,6 +301,7 @@ 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 {
lastCharacterWasPrintable = false;
switch (code) { switch (code) {
case CODE_FNC_1: case CODE_FNC_1:
case CODE_FNC_2: case CODE_FNC_2:
@ -325,6 +329,7 @@ public final class Code128Reader extends AbstractOneDReader {
if (code < 96) { if (code < 96) {
result.append((char) (' ' + code)); result.append((char) (' ' + code));
} else { } else {
lastCharacterWasPrintable = false;
switch (code) { switch (code) {
case CODE_FNC_1: case CODE_FNC_1:
case CODE_FNC_2: case CODE_FNC_2:
@ -355,6 +360,7 @@ public final class Code128Reader extends AbstractOneDReader {
} }
result.append(code); result.append(code);
} else { } else {
lastCharacterWasPrintable = false;
switch (code) { switch (code) {
case CODE_FNC_1: case CODE_FNC_1:
// do nothing? // do nothing?
@ -397,7 +403,7 @@ public final class Code128Reader extends AbstractOneDReader {
// 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();
if (resultLength > 0) { if (resultLength > 0 && lastCharacterWasPrintable) {
if (codeSet == CODE_CODE_C) { if (codeSet == CODE_CODE_C) {
result.delete(resultLength - 2, resultLength); result.delete(resultLength - 2, resultLength);
} else { } else {