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

Issue 1712 fix handling of start/stop chars

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2820 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen@gmail.com 2013-06-18 16:35:40 +00:00
parent f6df6000d5
commit 732d34cc5a
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/src/com/google/zxing/oned/CodaBarWriter.java
View file

@ -25,21 +25,30 @@ import java.util.Arrays;
*/ */
public final class CodaBarWriter extends OneDimensionalCodeWriter { public final class CodaBarWriter extends OneDimensionalCodeWriter {
private static final char[] START_CHARS = {'A', 'B', 'C', 'D'}; private static final char[] START_END_CHARS = {'A', 'B', 'C', 'D'};
private static final char[] END_CHARS = {'T', 'N', '*', 'E'}; private static final char[] ALT_START_END_CHARS = {'T', 'N', '*', 'E'};
@Override @Override
public boolean[] encode(String contents) { public boolean[] encode(String contents) {
if (contents.length() < 2) {
throw new IllegalArgumentException("Codabar should start/end with start/stop symbols");
}
// Verify input and calculate decoded length. // Verify input and calculate decoded length.
if (!CodaBarReader.arrayContains(START_CHARS, Character.toUpperCase(contents.charAt(0)))) { char firstChar = Character.toUpperCase(contents.charAt(0));
char lastChar = Character.toUpperCase(contents.charAt(contents.length() - 1));
boolean startsEndsNormal =
CodaBarReader.arrayContains(START_END_CHARS, firstChar) &&
CodaBarReader.arrayContains(START_END_CHARS, lastChar);
boolean startsEndsAlt =
CodaBarReader.arrayContains(ALT_START_END_CHARS, firstChar) &&
CodaBarReader.arrayContains(ALT_START_END_CHARS, lastChar);
if (!(startsEndsNormal || startsEndsAlt)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Codabar should start with one of the following: " + Arrays.toString(START_CHARS)); "Codabar should start/end with " + Arrays.toString(START_END_CHARS) +
} ", or start/end with " + Arrays.toString(ALT_START_END_CHARS));
if (!CodaBarReader.arrayContains(END_CHARS, Character.toUpperCase(contents.charAt(contents.length() - 1)))) {
throw new IllegalArgumentException(
"Codabar should end with one of the following: " + Arrays.toString(END_CHARS));
} }
// The start character and the end character are decoded to 10 length each. // The start character and the end character are decoded to 10 length each.
int resultLength = 20; int resultLength = 20;
char[] charsWhichAreTenLengthEachAfterDecoded = {'/', ':', '+', '.'}; char[] charsWhichAreTenLengthEachAfterDecoded = {'/', ':', '+', '.'};