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 1376 Check EAN13 checksum when encoding

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2454 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2012-10-10 20:32:05 +00:00
parent 191f541f4a
commit 91a71dba0b
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/com/google/zxing/oned/EAN13Writer.java
View file

@ -18,6 +18,7 @@ package com.google.zxing.oned;
import com.google.zxing.BarcodeFormat; import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType; import com.google.zxing.EncodeHintType;
import com.google.zxing.FormatException;
import com.google.zxing.WriterException; import com.google.zxing.WriterException;
import com.google.zxing.common.BitMatrix; import com.google.zxing.common.BitMatrix;
@ -55,6 +56,13 @@ public final class EAN13Writer extends UPCEANWriter {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Requested contents should be 13 digits long, but got " + contents.length()); "Requested contents should be 13 digits long, but got " + contents.length());
} }
try {
if (!UPCEANReader.checkStandardUPCEANChecksum(contents)) {
throw new IllegalArgumentException("Contents do not pass checksum");
}
} catch (FormatException fe) {
throw new IllegalArgumentException("Illegal contents");
}
int firstDigit = Integer.parseInt(contents.substring(0, 1)); int firstDigit = Integer.parseInt(contents.substring(0, 1));
int parities = EAN13Reader.FIRST_DIGIT_ENCODINGS[firstDigit]; int parities = EAN13Reader.FIRST_DIGIT_ENCODINGS[firstDigit];

2
core/src/com/google/zxing/oned/UPCEANReader.java
View file

@ -224,7 +224,7 @@ public abstract class UPCEANReader extends OneDReader {
* @return true iff string of digits passes the UPC/EAN checksum algorithm * @return true iff string of digits passes the UPC/EAN checksum algorithm
* @throws FormatException if the string does not contain only digits * @throws FormatException if the string does not contain only digits
*/ */
private static boolean checkStandardUPCEANChecksum(CharSequence s) throws FormatException { static boolean checkStandardUPCEANChecksum(CharSequence s) throws FormatException {
int length = s.length(); int length = s.length();
if (length == 0) { if (length == 0) {
return false; return false;