X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2FMultiFormatReader.java;h=c817d6801aff6076df086594182e8e61b04657f4;hb=cd86e6050f634084dd100567c4b1f44218aa7d8a;hp=6685882e8468880976c659829e4852804ef558b6;hpb=ac343e4ddc7af1f54c2d2634abb1be992d183a35;p=zxing.git

diff --git a/core/src/com/google/zxing/MultiFormatReader.java b/core/src/com/google/zxing/MultiFormatReader.java
index 6685882e..c817d680 100644
--- a/core/src/com/google/zxing/MultiFormatReader.java
+++ b/core/src/com/google/zxing/MultiFormatReader.java
@@ -99,10 +99,13 @@ public final class MultiFormatReader implements Reader {
               formats.contains(BarcodeFormat.UPC_E) ||
               formats.contains(BarcodeFormat.EAN_13) ||
               formats.contains(BarcodeFormat.EAN_8) ||
+              //formats.contains(BarcodeFormat.CODABAR) ||
               formats.contains(BarcodeFormat.CODE_39) ||
+              formats.contains(BarcodeFormat.CODE_93) ||
               formats.contains(BarcodeFormat.CODE_128) ||
               formats.contains(BarcodeFormat.ITF) ||
-              formats.contains(BarcodeFormat.RSS14);
+              formats.contains(BarcodeFormat.RSS14) ||
+              formats.contains(BarcodeFormat.RSS_EXPANDED);
       // Put 1D readers upfront in "normal" mode
       if (addOneDReader && !tryHarder) {
         readers.addElement(new MultiFormatOneDReader(hints));
@@ -110,7 +113,7 @@ public final class MultiFormatReader implements Reader {
       if (formats.contains(BarcodeFormat.QR_CODE)) {
         readers.addElement(new QRCodeReader());
       }
-      if (formats.contains(BarcodeFormat.DATAMATRIX)) {
+      if (formats.contains(BarcodeFormat.DATA_MATRIX)) {
         readers.addElement(new DataMatrixReader());
       }
       if (formats.contains(BarcodeFormat.PDF417)) {
@@ -126,13 +129,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));
       }