mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse source 
Added PDF417 to list of readers. Will be used only if its specified in a Hint.

git-svn-id: https://zxing.googlecode.com/svn/trunk@980 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
kev.sully 2009-06-24 10:01:47 +00:00
parent 6367973b49
commit f80399966f
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/src/com/google/zxing/MultiFormatReader.java
View file

@ -17,6 +17,7 @@
package com.google.zxing; package com.google.zxing;
import com.google.zxing.oned.MultiFormatOneDReader; import com.google.zxing.oned.MultiFormatOneDReader;
import com.google.zxing.pdf417.PDF417Reader;
import com.google.zxing.qrcode.QRCodeReader; import com.google.zxing.qrcode.QRCodeReader;
import com.google.zxing.datamatrix.DataMatrixReader; import com.google.zxing.datamatrix.DataMatrixReader;
@ -100,7 +101,8 @@ public final class MultiFormatReader implements Reader {
formats.contains(BarcodeFormat.EAN_8) || formats.contains(BarcodeFormat.EAN_8) ||
formats.contains(BarcodeFormat.CODE_39) || formats.contains(BarcodeFormat.CODE_39) ||
formats.contains(BarcodeFormat.CODE_128) || formats.contains(BarcodeFormat.CODE_128) ||
formats.contains(BarcodeFormat.ITF); formats.contains(BarcodeFormat.ITF) ||
formats.contains(BarcodeFormat.PDF417);
// Put 1D readers upfront in "normal" mode // Put 1D readers upfront in "normal" mode
if (addOneDReader && !tryHarder) { if (addOneDReader && !tryHarder) {
readers.addElement(new MultiFormatOneDReader(hints)); readers.addElement(new MultiFormatOneDReader(hints));
@ -111,6 +113,9 @@ public final class MultiFormatReader implements Reader {
if (formats.contains(BarcodeFormat.DATAMATRIX)) { if (formats.contains(BarcodeFormat.DATAMATRIX)) {
readers.addElement(new DataMatrixReader()); readers.addElement(new DataMatrixReader());
} }
if (formats.contains(BarcodeFormat.PDF417)) {
readers.addElement(new PDF417Reader());
}
// At end in "try harder" mode // At end in "try harder" mode
if (addOneDReader && tryHarder) { if (addOneDReader && tryHarder) {
readers.addElement(new MultiFormatOneDReader(hints)); readers.addElement(new MultiFormatOneDReader(hints));
@ -121,8 +126,13 @@ public final class MultiFormatReader implements Reader {
readers.addElement(new MultiFormatOneDReader(hints)); readers.addElement(new MultiFormatOneDReader(hints));
} }
readers.addElement(new QRCodeReader()); readers.addElement(new QRCodeReader());
// TODO re-enable once Data Matrix is ready // TODO re-enable once Data Matrix is ready
// readers.addElement(new DataMatrixReader()); // readers.addElement(new DataMatrixReader());
// TODO: Enable once PDF417 has passed QA
//readers.addElement(new PDF417Reader());
if (tryHarder) { if (tryHarder) {
readers.addElement(new MultiFormatOneDReader(hints)); readers.addElement(new MultiFormatOneDReader(hints));
} }