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

Cleanups while looking at issue #268

Browse source
This commit is contained in:
Sean Owen 2014-12-13 17:13:39 +00:00
parent 344d55e688
commit ce1fbe1b76
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/src/main/java/com/google/zxing/datamatrix/decoder/DecodedBitStreamParser.java
View file

@ -71,6 +71,9 @@ final class DecodedBitStreamParser {
'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
}; };
// Shift 2 for Text is the same encoding as C40
private static final char[] TEXT_SHIFT2_SET_CHARS = C40_SHIFT2_SET_CHARS;
private static final char[] TEXT_SHIFT3_SET_CHARS = { private static final char[] TEXT_SHIFT3_SET_CHARS = {
'`', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', '`', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '{', '|', '}', '~', (char) 127 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '{', '|', '}', '~', (char) 127
@ -139,7 +142,7 @@ final class DecodedBitStreamParser {
return Mode.PAD_ENCODE; return Mode.PAD_ENCODE;
} else if (oneByte <= 229) { // 2-digit data 00-99 (Numeric Value + 130) } else if (oneByte <= 229) { // 2-digit data 00-99 (Numeric Value + 130)
int value = oneByte - 130; int value = oneByte - 130;
if (value < 10) { // padd with '0' for single digit values if (value < 10) { // pad with '0' for single digit values
result.append('0'); result.append('0');
} }
result.append(value); result.append(value);
@ -319,13 +322,13 @@ final class DecodedBitStreamParser {
break; break;
case 2: case 2:
// Shift 2 for Text is the same encoding as C40 // Shift 2 for Text is the same encoding as C40
if (cValue < C40_SHIFT2_SET_CHARS.length) { if (cValue < TEXT_SHIFT2_SET_CHARS.length) {
char c40char = C40_SHIFT2_SET_CHARS[cValue]; char textChar = TEXT_SHIFT2_SET_CHARS[cValue];
if (upperShift) { if (upperShift) {
result.append((char) (c40char + 128)); result.append((char) (textChar + 128));
upperShift = false; upperShift = false;
} else { } else {
result.append(c40char); result.append(textChar);
} }
} else if (cValue == 27) { // FNC1 } else if (cValue == 27) { // FNC1
result.append((char) 29); // translate as ASCII 29 result.append((char) 29); // translate as ASCII 29

2
pom.xml
View file

@ -75,7 +75,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.12-beta-3</version> <version>4.12</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>