package com.google.zxing;
+import com.google.zxing.datamatrix.DataMatrixReader;
import com.google.zxing.oned.MultiFormatOneDReader;
+import com.google.zxing.pdf417.PDF417Reader;
import com.google.zxing.qrcode.QRCodeReader;
import java.util.Hashtable;
* By default it attempts to decode all barcode formats that the library supports. Optionally, you
* can provide a hints object to request different behavior, for example only decoding QR codes.
*
- * @author srowen@google.com (Sean Owen), dswitkin@google.com (Daniel Switkin)
+ * @author Sean Owen
+ * @author dswitkin@google.com (Daniel Switkin)
*/
public final class MultiFormatReader implements Reader {
private Vector readers;
/**
- * This version of decode honors the intent of Reader.decode(MonochromeBitmapSource) in that it
+ * This version of decode honors the intent of Reader.decode(BinaryBitmap) in that it
* passes null as a hint to the decoders. However, that makes it inefficient to call repeatedly.
* Use setHints() followed by decodeWithState() for continuous scan applications.
*
* @param image The pixel data to decode
* @return The contents of the image
- * @throws ReaderException Any errors which occurred
+ * @throws NotFoundException Any errors which occurred
*/
- public Result decode(MonochromeBitmapSource image) throws ReaderException {
+ public Result decode(BinaryBitmap image) throws NotFoundException {
setHints(null);
return decodeInternal(image);
}
* @param image The pixel data to decode
* @param hints The hints to use, clearing the previous state.
* @return The contents of the image
- * @throws ReaderException Any errors which occurred
+ * @throws NotFoundException Any errors which occurred
*/
- public Result decode(MonochromeBitmapSource image, Hashtable hints) throws ReaderException {
+ public Result decode(BinaryBitmap image, Hashtable hints) throws NotFoundException {
setHints(hints);
return decodeInternal(image);
}
/**
- * Decode an image using the state set up by calling setHints() previously.
+ * Decode an image using the state set up by calling setHints() previously. Continuous scan
+ * clients will get a <b>large</b> speed increase by using this instead of decode().
*
* @param image The pixel data to decode
* @return The contents of the image
- * @throws ReaderException Any errors which occurred
+ * @throws NotFoundException Any errors which occurred
*/
- public Result decodeWithState(MonochromeBitmapSource image) throws ReaderException {
+ public Result decodeWithState(BinaryBitmap image) throws NotFoundException {
// Make sure to set up the default state so we don't crash
if (readers == null) {
setHints(null);
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);
+ formats.contains(BarcodeFormat.UPC_A) ||
+ 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.RSS_EXPANDED);
// Put 1D readers upfront in "normal" mode
if (addOneDReader && !tryHarder) {
- readers.addElement(new MultiFormatOneDReader());
+ readers.addElement(new MultiFormatOneDReader(hints));
}
- if (possibleFormats.contains(BarcodeFormat.QR_CODE)) {
+ if (formats.contains(BarcodeFormat.QR_CODE)) {
readers.addElement(new QRCodeReader());
}
- // TODO re-enable once Data Matrix is ready
- //if (possibleFormats.contains(BarcodeFormat.DATAMATRIX)) {
- // readers.addElement(new DataMatrixReader());
- //}
+ if (formats.contains(BarcodeFormat.DATA_MATRIX)) {
+ 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());
+ readers.addElement(new MultiFormatOneDReader(hints));
}
}
if (readers.isEmpty()) {
if (!tryHarder) {
- readers.addElement(new MultiFormatOneDReader());
+ readers.addElement(new MultiFormatOneDReader(hints));
}
readers.addElement(new QRCodeReader());
- // 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) {
- readers.addElement(new MultiFormatOneDReader());
+ readers.addElement(new MultiFormatOneDReader(hints));
}
}
}
- private Result decodeInternal(MonochromeBitmapSource image) throws ReaderException {
- for (int i = 0; i < readers.size(); i++) {
+ public void reset() {
+ int size = readers.size();
+ for (int i = 0; i < size; i++) {
+ Reader reader = (Reader) readers.elementAt(i);
+ reader.reset();
+ }
+ }
+
+ private Result decodeInternal(BinaryBitmap image) throws NotFoundException {
+ int size = readers.size();
+ for (int i = 0; i < size; i++) {
Reader reader = (Reader) readers.elementAt(i);
try {
return reader.decode(image, hints);
}
}
- throw new ReaderException("No barcode was detected in this image.");
+ throw NotFoundException.getNotFoundInstance();
}
}
projects / zxing.git / blobdiff