X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Foned%2FMultiFormatOneDReader.java;h=ea0d19745862b8936d7d532bd058efbe90dfd17b;hb=31bcfd7bc170718c2225b6944c48cff627c58641;hp=b74a7735f8774fc7c698b720010776ed0f6bbebf;hpb=a30e66246de791c2e5ab868fb015e3b08fdfdfbf;p=zxing.git diff --git a/core/src/com/google/zxing/oned/MultiFormatOneDReader.java b/core/src/com/google/zxing/oned/MultiFormatOneDReader.java index b74a7735..ea0d1974 100644 --- a/core/src/com/google/zxing/oned/MultiFormatOneDReader.java +++ b/core/src/com/google/zxing/oned/MultiFormatOneDReader.java @@ -27,7 +27,7 @@ import java.util.Vector; /** * @author dswitkin@google.com (Daniel Switkin) - * @author srowen@google.com (Sean Owen) + * @author Sean Owen */ public final class MultiFormatOneDReader extends AbstractOneDReader { @@ -49,11 +49,15 @@ public final class MultiFormatOneDReader extends AbstractOneDReader { if (possibleFormats.contains(BarcodeFormat.CODE_128)) { readers.addElement(new Code128Reader()); } + if (possibleFormats.contains(BarcodeFormat.ITF)) { + readers.addElement(new ITFReader()); + } } if (readers.isEmpty()) { readers.addElement(new MultiFormatUPCEANReader(hints)); readers.addElement(new Code39Reader()); readers.addElement(new Code128Reader()); + readers.addElement(new ITFReader()); } } @@ -68,7 +72,7 @@ public final class MultiFormatOneDReader extends AbstractOneDReader { } } - throw new ReaderException("No barcode was detected in this image."); + throw ReaderException.getInstance(); } }