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

Issue 1074 fix incorrect decoding of some numeric segments

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2048 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2011-11-23 19:04:59 +00:00
parent 39c51ad06b
commit d0850c3baf
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/src/com/google/zxing/pdf417/decoder/DecodedBitStreamParser.java
View file

@ -433,7 +433,7 @@ final class DecodedBitStreamParser {
* @param result The decoded data is appended to the result.
* @return The next index into the codeword array.
*/
private static int numericCompaction(int[] codewords, int codeIndex, StringBuilder result) {
private static int numericCompaction(int[] codewords, int codeIndex, StringBuilder result) throws FormatException {
int count = 0;
boolean end = false;
@ -465,7 +465,7 @@ final class DecodedBitStreamParser {
// while in Numeric Compaction mode) serves to terminate the
// current Numeric Compaction mode grouping as described in 5.4.4.2,
// and then to start a new one grouping.
BigInteger s = decodeBase900toBase10(numericCodewords, count);
String s = decodeBase900toBase10(numericCodewords, count);
result.append(s);
count = 0;
}
@ -516,12 +516,16 @@ final class DecodedBitStreamParser {
Remove leading 1 => Result is 000213298174000
*/
private static BigInteger decodeBase900toBase10(int[] codewords, int count) {
private static String decodeBase900toBase10(int[] codewords, int count) throws FormatException {
BigInteger result = BigInteger.ZERO;
for (int i = 0; i < count; i++) {
result = result.add(EXP900[count - i - 1].multiply(BigInteger.valueOf(codewords[i])));
}
return result;
String resultString = result.toString();
if (resultString.charAt(0) != '1') {
throw FormatException.getFormatInstance();
}
return resultString.substring(1);
}
}