mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add ALLOWED_LENGTHS hint, for now, in support of ITF

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@834 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2009-01-30 17:29:27 +00:00
parent d1cae5a9b2
commit 1e8155190d
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/src/com/google/zxing/DecodeHintType.java
View file

@ -52,6 +52,11 @@ public final class DecodeHintType {
*/ */
public static final DecodeHintType TRY_HARDER = new DecodeHintType(); public static final DecodeHintType TRY_HARDER = new DecodeHintType();
/**
* Allowed lengths of encoded data -- reject anything else. Maps to an {@link int[]}.
*/
public static final DecodeHintType ALLOWED_LENGTHS = new DecodeHintType();
private DecodeHintType() { private DecodeHintType() {
} }

18
core/src/com/google/zxing/oned/ITFReader.java
View file

@ -20,6 +20,7 @@ import com.google.zxing.BarcodeFormat;
import com.google.zxing.ReaderException; import com.google.zxing.ReaderException;
import com.google.zxing.Result; import com.google.zxing.Result;
import com.google.zxing.ResultPoint; import com.google.zxing.ResultPoint;
import com.google.zxing.DecodeHintType;
import com.google.zxing.common.BitArray; import com.google.zxing.common.BitArray;
import com.google.zxing.common.GenericResultPoint; import com.google.zxing.common.GenericResultPoint;
@ -45,6 +46,8 @@ public final class ITFReader extends AbstractOneDReader {
private static final int W = 3; // Pixel width of a wide line private static final int W = 3; // Pixel width of a wide line
private static final int N = 1; // Pixed width of a narrow line private static final int N = 1; // Pixed width of a narrow line
private static final int[] DEFAULT_ALLOWED_LENGTHS = { 6, 10, 14 };
// Stores the actual narrow line width of the image being decoded. // Stores the actual narrow line width of the image being decoded.
private int narrowLineWidth = -1; private int narrowLineWidth = -1;
@ -85,10 +88,23 @@ public final class ITFReader extends AbstractOneDReader {
String resultString = result.toString(); String resultString = result.toString();
int[] allowedLengths = (int[]) hints.get(DecodeHintType.ALLOWED_LENGTHS);
if (allowedLengths == null) {
allowedLengths = DEFAULT_ALLOWED_LENGTHS;
}
// To avoid false positives with 2D barcodes (and other patterns), make // To avoid false positives with 2D barcodes (and other patterns), make
// an assumption that the decoded string must be 6, 10 or 14 digits. // an assumption that the decoded string must be 6, 10 or 14 digits.
int length = resultString.length(); int length = resultString.length();
if (length != 6 && length != 10 && length != 14) { boolean lengthOK = false;
for (int i = 0; i < allowedLengths.length; i++) {
if (length == allowedLengths[i]) {
lengthOK = true;
break;
}
}
if (!lengthOK) {
throw ReaderException.getInstance(); throw ReaderException.getInstance();
} }