ISSUE: http://code.google.com/p/zxing/issues/detail?id=42

[zxing.git] / core / src / com / google / zxing / MultiFormatReader.java

diff --git a/core/src/com/google/zxing/MultiFormatReader.java b/core/src/com/google/zxing/MultiFormatReader.java
index 2677c3a..c7ba5df 100644 (file)
--- a/core/src/com/google/zxing/MultiFormatReader.java
+++ b/core/src/com/google/zxing/MultiFormatReader.java
@@ -17,6 +17,7 @@
 package com.google.zxing;
 
 import com.google.zxing.oned.MultiFormatOneDReader;
+import com.google.zxing.pdf417.PDF417Reader;
 import com.google.zxing.qrcode.QRCodeReader;
 import com.google.zxing.datamatrix.DataMatrixReader;
 
@@ -90,27 +91,31 @@ public final class MultiFormatReader implements Reader {
     this.hints = hints;
 
     boolean tryHarder = hints != null && hints.containsKey(DecodeHintType.TRY_HARDER);
-    Vector possibleFormats = hints == null ? null : (Vector) hints.get(DecodeHintType.POSSIBLE_FORMATS);
+    Vector formats = hints == null ? null : (Vector) hints.get(DecodeHintType.POSSIBLE_FORMATS);
     readers = new Vector();
-    if (possibleFormats != null) {
+    if (formats != null) {
       boolean addOneDReader =
-          possibleFormats.contains(BarcodeFormat.UPC_A) ||
-              possibleFormats.contains(BarcodeFormat.UPC_E) ||
-              possibleFormats.contains(BarcodeFormat.EAN_13) ||
-              possibleFormats.contains(BarcodeFormat.EAN_8) ||
-              possibleFormats.contains(BarcodeFormat.CODE_39) ||
-              possibleFormats.contains(BarcodeFormat.CODE_128) ||
-              possibleFormats.contains(BarcodeFormat.ITF);
+          formats.contains(BarcodeFormat.UPC_A) ||
+              formats.contains(BarcodeFormat.UPC_E) ||
+              formats.contains(BarcodeFormat.EAN_13) ||
+              formats.contains(BarcodeFormat.EAN_8) ||
+              formats.contains(BarcodeFormat.CODE_39) ||
+              formats.contains(BarcodeFormat.CODE_128) ||
+              formats.contains(BarcodeFormat.ITF) ||
+              formats.contains(BarcodeFormat.PDF417);
       // Put 1D readers upfront in "normal" mode
       if (addOneDReader && !tryHarder) {
         readers.addElement(new MultiFormatOneDReader(hints));
       }
-      if (possibleFormats.contains(BarcodeFormat.QR_CODE)) {
+      if (formats.contains(BarcodeFormat.QR_CODE)) {
         readers.addElement(new QRCodeReader());
       }
-      if (possibleFormats.contains(BarcodeFormat.DATAMATRIX)) {
+      if (formats.contains(BarcodeFormat.DATAMATRIX)) {
         readers.addElement(new DataMatrixReader());
       }
+      if (formats.contains(BarcodeFormat.PDF417)) {
+         readers.addElement(new PDF417Reader());
+       }
       // At end in "try harder" mode
       if (addOneDReader && tryHarder) {
         readers.addElement(new MultiFormatOneDReader(hints));
@@ -121,8 +126,13 @@ public final class MultiFormatReader implements Reader {
         readers.addElement(new MultiFormatOneDReader(hints));
       }
       readers.addElement(new QRCodeReader());
+      
       // TODO re-enable once Data Matrix is ready
       // readers.addElement(new DataMatrixReader());
+      
+      // TODO: Enable once PDF417 has passed QA
+      //readers.addElement(new PDF417Reader());
+      
       if (tryHarder) {
         readers.addElement(new MultiFormatOneDReader(hints));
       }