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

PDF417 Macro: fileId numeric decode; allow Macro only symbol (#1379)

Browse source 
* PDF417 Macro: fileId numeric decode; allow Macro only symbol

* PDF417 Macro: additional FormatException unit tests
This commit is contained in:
gitlost 2021-04-12 15:44:42 +01:00 committed by GitHub
parent 99e9b34f5a
commit d4c3d73592
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 95 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -157,7 +157,7 @@ final class DecodedBitStreamParser {
throw FormatException.getFormatInstance();
}
}
if (result.length() == 0) {
if (result.length() == 0 && resultMetadata.getFileId() == null) {
throw FormatException.getFormatInstance();
}
DecoderResult decoderResult = new DecoderResult(null, result.toString(), null, ecLevel);
@ -179,9 +179,19 @@ final class DecodedBitStreamParser {
resultMetadata.setSegmentIndex(Integer.parseInt(decodeBase900toBase10(segmentIndexArray,
NUMBER_OF_SEQUENCE_CODEWORDS)));
StringBuilder fileId = new StringBuilder();
codeIndex = textCompaction(codewords, codeIndex, fileId);
resultMetadata.setFileId(fileId.toString());
// Decoding the fileId codewords as 0-899 numbers, each 0-filled to width 3. This follows the spec
// (See ISO/IEC 15438:2015 Annex H.6) and preserves all info, but some generators (e.g. TEC-IT) write
// the fileId using text compaction, so in those cases the fileId will appear mangled.
String fileId = "";
for (int i = 0; codeIndex < codewords[0] && codewords[codeIndex] != MACRO_PDF417_TERMINATOR
&& codewords[codeIndex] != BEGIN_MACRO_PDF417_OPTIONAL_FIELD; i++, codeIndex++) {
fileId += String.format("%03d", codewords[codeIndex]);
}
if (fileId.length() == 0) {
// at least one fileId codeword is required (Annex H.2)
throw FormatException.getFormatInstance();
}
resultMetadata.setFileId(fileId);
int optionalFieldsStart = -1;
if (codewords[codeIndex] == BEGIN_MACRO_PDF417_OPTIONAL_FIELD) {

85
core/src/test/java/com/google/zxing/pdf417/decoder/PDF417DecoderTestCase.java
View file

@ -18,6 +18,7 @@ package com.google.zxing.pdf417.decoder;
import com.google.zxing.FormatException;
import com.google.zxing.pdf417.PDF417ResultMetadata;
import com.google.zxing.common.DecoderResult;
import org.junit.Assert;
import org.junit.Test;
@ -39,7 +40,7 @@ public class PDF417DecoderTestCase extends Assert {
DecodedBitStreamParser.decodeMacroBlock(sampleCodes, 2, resultMetadata);
assertEquals(0, resultMetadata.getSegmentIndex());
assertEquals("ARBX", resultMetadata.getFileId());
assertEquals("017053", resultMetadata.getFileId());
assertFalse(resultMetadata.isLastSegment());
assertEquals(4, resultMetadata.getSegmentCount());
assertEquals("CEN BE", resultMetadata.getSender());
@ -66,7 +67,7 @@ public class PDF417DecoderTestCase extends Assert {
DecodedBitStreamParser.decodeMacroBlock(sampleCodes, 2, resultMetadata);
assertEquals(3, resultMetadata.getSegmentIndex());
assertEquals("ARBX", resultMetadata.getFileId());
assertEquals("017053", resultMetadata.getFileId());
assertTrue(resultMetadata.isLastSegment());
assertEquals(4, resultMetadata.getSegmentCount());
assertNull(resultMetadata.getAddressee());
@ -79,6 +80,32 @@ public class PDF417DecoderTestCase extends Assert {
104, optionalData[optionalData.length - 1]);
}
/**
* Tests the example given in ISO/IEC 15438:2015(E) - Annex H.6
*/
@Test
public void testStandardSample3() throws FormatException {
PDF417ResultMetadata resultMetadata = new PDF417ResultMetadata();
int[] sampleCodes = {7, 928, 111, 100, 100, 200, 300,
0}; // Final dummy ECC codeword required to avoid ArrayIndexOutOfBounds
DecodedBitStreamParser.decodeMacroBlock(sampleCodes, 2, resultMetadata);
assertEquals(0, resultMetadata.getSegmentIndex());
assertEquals("100200300", resultMetadata.getFileId());
assertFalse(resultMetadata.isLastSegment());
assertEquals(-1, resultMetadata.getSegmentCount());
assertNull(resultMetadata.getAddressee());
assertNull(resultMetadata.getSender());
assertNull(resultMetadata.getOptionalData());
// Check that symbol containing no data except Macro is accepted (see note in Annex H.2)
DecoderResult decoderResult = DecodedBitStreamParser.decode(sampleCodes, "0");
assertEquals("", decoderResult.getText());
assertNotNull(decoderResult.getOther());
}
@Test
public void testSampleWithFilename() throws FormatException {
int[] sampleCodes = {23, 477, 928, 111, 100, 0, 252, 21, 86, 923, 0, 815, 251, 133, 12, 148, 537, 593,
@ -89,7 +116,7 @@ public class PDF417DecoderTestCase extends Assert {
DecodedBitStreamParser.decodeMacroBlock(sampleCodes, 3, resultMetadata);
assertEquals(0, resultMetadata.getSegmentIndex());
assertEquals("AAIMAVC ", resultMetadata.getFileId());
assertEquals("000252021086", resultMetadata.getFileId());
assertFalse(resultMetadata.isLastSegment());
assertEquals(2, resultMetadata.getSegmentCount());
assertNull(resultMetadata.getAddressee());
@ -106,7 +133,7 @@ public class PDF417DecoderTestCase extends Assert {
DecodedBitStreamParser.decodeMacroBlock(sampleCodes, 3, resultMetadata);
assertEquals(0, resultMetadata.getSegmentIndex());
assertEquals("AAIMAVC ", resultMetadata.getFileId());
assertEquals("000252021086", resultMetadata.getFileId());
assertFalse(resultMetadata.isLastSegment());
assertEquals(180980729000000L, resultMetadata.getTimestamp());
@ -114,4 +141,54 @@ public class PDF417DecoderTestCase extends Assert {
assertEquals(260013, resultMetadata.getChecksum());
}
@Test
public void testSampleWithMacroTerminatorOnly() throws FormatException {
int[] sampleCodes = {7, 477, 928, 222, 198, 0, 922};
PDF417ResultMetadata resultMetadata = new PDF417ResultMetadata();
DecodedBitStreamParser.decodeMacroBlock(sampleCodes, 3, resultMetadata);
assertEquals(99998, resultMetadata.getSegmentIndex());
assertEquals("000", resultMetadata.getFileId());
assertTrue(resultMetadata.isLastSegment());
assertEquals(-1, resultMetadata.getSegmentCount());
assertNull(resultMetadata.getOptionalData());
}
@Test
public void testSampleWithBadSequenceIndexMacro() throws FormatException {
int[] sampleCodes = {3, 928, 222, 0};
PDF417ResultMetadata resultMetadata = new PDF417ResultMetadata();
try {
DecodedBitStreamParser.decodeMacroBlock(sampleCodes, 2, resultMetadata);
} catch (FormatException expected) {
// continue
}
}
@Test
public void testSampleWithNoFileIdMacro() throws FormatException {
int[] sampleCodes = {4, 928, 222, 198, 0};
PDF417ResultMetadata resultMetadata = new PDF417ResultMetadata();
try {
DecodedBitStreamParser.decodeMacroBlock(sampleCodes, 2, resultMetadata);
} catch (FormatException expected) {
// continue
}
}
@Test
public void testSampleWithNoDataNoMacro() throws FormatException {
int[] sampleCodes = {3, 899, 899, 0};
try {
DecodedBitStreamParser.decode(sampleCodes, "0");
} catch (FormatException expected) {
// continue
}
}
}