X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=core%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2FMultiFormatReader.java;h=0409436ada9ed6b39318825b92f3b1910ed066ec;hp=303242264474b8ab30a3a2b6baaa32e2519c2161;hb=0ee5f7050379e4edac731b8bc15ff68b6e03949c;hpb=519b4eef0f88aa0af7e286416c9084fa30f745ad diff --git a/core/src/com/google/zxing/MultiFormatReader.java b/core/src/com/google/zxing/MultiFormatReader.java index 30324226..0409436a 100644 --- a/core/src/com/google/zxing/MultiFormatReader.java +++ b/core/src/com/google/zxing/MultiFormatReader.java @@ -18,6 +18,7 @@ package com.google.zxing; import com.google.zxing.oned.MultiFormatOneDReader; import com.google.zxing.qrcode.QRCodeReader; +import com.google.zxing.datamatrix.DataMatrixReader; import java.util.Hashtable; import java.util.Vector; @@ -51,10 +52,14 @@ public final class MultiFormatReader implements Reader { if (possibleFormats.contains(BarcodeFormat.QR_CODE)) { readers.addElement(new QRCodeReader()); } + if (possibleFormats.contains(BarcodeFormat.DATAMATRIX)) { + readers.addElement(new DataMatrixReader()); + } } if (readers.isEmpty()) { readers.addElement(new MultiFormatOneDReader()); readers.addElement(new QRCodeReader()); + readers.addElement(new DataMatrixReader()); } for (int i = 0; i < readers.size(); i++) {