From 748945281cfe475b2b3d7396d5eeb70b6d99195b Mon Sep 17 00:00:00 2001 From: srowen Date: Wed, 11 Jan 2012 22:09:48 +0000 Subject: [PATCH] Issue 1122 allow short code 39/93 git-svn-id: https://zxing.googlecode.com/svn/trunk@2114 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- core/src/com/google/zxing/oned/Code128Reader.java | 2 +- core/src/com/google/zxing/oned/Code39Reader.java | 4 ++-- core/src/com/google/zxing/oned/Code93Reader.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/com/google/zxing/oned/Code128Reader.java b/core/src/com/google/zxing/oned/Code128Reader.java index 49eafcca1..bf1b62f95 100644 --- a/core/src/com/google/zxing/oned/Code128Reader.java +++ b/core/src/com/google/zxing/oned/Code128Reader.java @@ -431,7 +431,7 @@ public final class Code128Reader extends OneDReader { int resultLength = result.length(); if (resultLength == 0) { // false positive - throw ChecksumException.getChecksumInstance(); + throw NotFoundException.getNotFoundInstance(); } // Only bother if the result had at least one character, and if the checksum digit happened to diff --git a/core/src/com/google/zxing/oned/Code39Reader.java b/core/src/com/google/zxing/oned/Code39Reader.java index 32d3aa67c..f7021e3fe 100644 --- a/core/src/com/google/zxing/oned/Code39Reader.java +++ b/core/src/com/google/zxing/oned/Code39Reader.java @@ -146,8 +146,8 @@ public final class Code39Reader extends OneDReader { result.setLength(max); } - if (result.length() < 4) { - // Almost surely a false positive + if (result.length() == 0) { + // false positive throw NotFoundException.getNotFoundInstance(); } diff --git a/core/src/com/google/zxing/oned/Code93Reader.java b/core/src/com/google/zxing/oned/Code93Reader.java index c8fe2aa81..1106d5e87 100644 --- a/core/src/com/google/zxing/oned/Code93Reader.java +++ b/core/src/com/google/zxing/oned/Code93Reader.java @@ -88,8 +88,8 @@ public final class Code93Reader extends OneDReader { throw NotFoundException.getNotFoundInstance(); } - if (result.length() < 4) { - // Almost surely a false positive + if (result.length() < 2) { + // false positive -- need at least 2 checksum digits throw NotFoundException.getNotFoundInstance(); }