mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-01-12 19:57:27 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Issue #179 : add default start/end guard to Codabar if not specified, for symmetry with decoder

Browse source
This commit is contained in:
Sean Owen 2014-07-03 23:19:28 +01:00
parent 47d877d80a
commit a0c53e0558
1 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,8 +16,6 @@
package com.google.zxing.oned; package com.google.zxing.oned;
import java.util.Arrays;
/** /**
* This class renders CodaBar as {@code boolean[]}. * This class renders CodaBar as {@code boolean[]}.
* *
@ -28,26 +26,40 @@ public final class CodaBarWriter extends OneDimensionalCodeWriter {
private static final char[] START_END_CHARS = {'A', 'B', 'C', 'D'}; private static final char[] START_END_CHARS = {'A', 'B', 'C', 'D'};
private static final char[] ALT_START_END_CHARS = {'T', 'N', '*', 'E'}; private static final char[] ALT_START_END_CHARS = {'T', 'N', '*', 'E'};
private static final char[] CHARS_WHICH_ARE_TEN_LENGTH_EACH_AFTER_DECODED = {'/', ':', '+', '.'}; private static final char[] CHARS_WHICH_ARE_TEN_LENGTH_EACH_AFTER_DECODED = {'/', ':', '+', '.'};
private static final char DEFAULT_GUARD = START_END_CHARS[0];
@Override @Override
public boolean[] encode(String contents) { public boolean[] encode(String contents) {
if (contents.length() < 2) { if (contents.length() < 2) {
throw new IllegalArgumentException("Codabar should start/end with start/stop symbols"); // Can't have a start/end guard, so tentatively add default guards
} contents = DEFAULT_GUARD + contents + DEFAULT_GUARD;
} else {
// Verify input and calculate decoded length. // Verify input and calculate decoded length.
char firstChar = Character.toUpperCase(contents.charAt(0)); char firstChar = Character.toUpperCase(contents.charAt(0));
char lastChar = Character.toUpperCase(contents.charAt(contents.length() - 1)); char lastChar = Character.toUpperCase(contents.charAt(contents.length() - 1));
boolean startsEndsNormal = boolean startsNormal = CodaBarReader.arrayContains(START_END_CHARS, firstChar);
CodaBarReader.arrayContains(START_END_CHARS, firstChar) && boolean endsNormal = CodaBarReader.arrayContains(START_END_CHARS, lastChar);
CodaBarReader.arrayContains(START_END_CHARS, lastChar); boolean startsAlt = CodaBarReader.arrayContains(ALT_START_END_CHARS, firstChar);
boolean startsEndsAlt = boolean endsAlt = CodaBarReader.arrayContains(ALT_START_END_CHARS, lastChar);
CodaBarReader.arrayContains(ALT_START_END_CHARS, firstChar) && if (startsNormal) {
CodaBarReader.arrayContains(ALT_START_END_CHARS, lastChar); if (!endsNormal) {
if (!(startsEndsNormal || startsEndsAlt)) { throw new IllegalArgumentException("Invalid start/end guards: " + contents);
throw new IllegalArgumentException( }
"Codabar should start/end with " + Arrays.toString(START_END_CHARS) + // else already has valid start/end
", or start/end with " + Arrays.toString(ALT_START_END_CHARS)); } else if (startsAlt) {
if (!endsAlt) {
throw new IllegalArgumentException("Invalid start/end guards: " + contents);
}
// else already has valid start/end
} else {
// Doesn't start with a guard
if (endsNormal || endsAlt) {
throw new IllegalArgumentException("Invalid start/end guards: " + contents);
}
// else doesn't end with guard either, so add a default
contents = DEFAULT_GUARD + contents + DEFAULT_GUARD;
}
} }
// 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.