Merge pull request #453 from graug/dev

Ignore additional PDF417 barcode rows, https://github.com/zxing/zxing/issues/449

core/src/main/java/com/google/zxing/pdf417/decoder/DetectionResultRowIndicatorColumn.java

@@ -122,7 +122,8 @@ final class DetectionResultRowIndicatorColumn extends DetectionResultColumn {
       if (codeword != null) {
         int rowNumber = codeword.getRowNumber();
         if (rowNumber >= result.length) {
-          throw FormatException.getFormatInstance();
+          // We have more rows than the barcode metadata allows for, ignore them.
+          continue;
         }
         result[rowNumber]++;
       } // else throw exception?

core/src/main/java/com/google/zxing/pdf417/decoder/PDF417ScanningDecoder.java

@@ -343,7 +343,8 @@ public final class PDF417ScanningDecoder {
             int rowNumber = codeword.getRowNumber();
             if (rowNumber >= 0) {
               if (rowNumber >= barcodeMatrix.length) {
-                throw FormatException.getFormatInstance();
+                // We have more rows than the barcode metadata allows for, ignore them.
+                continue;
               }
               barcodeMatrix[rowNumber][column].setValue(codeword.getValue());
             }

core/src/test/java/com/google/zxing/pdf417/PDF417BlackBox1TestCase.java

@@ -29,8 +29,8 @@ public final class PDF417BlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public PDF417BlackBox1TestCase() {
     super("src/test/resources/blackbox/pdf417-1", new MultiFormatReader(), BarcodeFormat.PDF_417);
-    addTest(9, 9, 0.0f);
-    addTest(9, 9, 180.0f);
+    addTest(10, 10, 0.0f);
+    addTest(10, 10, 180.0f);
   }
 
 }

core/src/test/resources/blackbox/pdf417-1/11.txt

@@ -0,0 +1 @@
+This is just a test.