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 com.google.zxing.datamatrix.DataMatrixReader;
import java.util.Hashtable;
import java.util.Vector;
*
* @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(BinaryBitmap 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(BinaryBitmap image, Hashtable hints) throws ReaderException {
+ public Result decode(BinaryBitmap image, Hashtable hints) throws NotFoundException {
setHints(hints);
return decodeInternal(image);
}
*
* @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(BinaryBitmap 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);
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));
}
}
- private Result decodeInternal(BinaryBitmap image) throws ReaderException {
+ private Result decodeInternal(BinaryBitmap image) throws NotFoundException {
int size = readers.size();
for (int i = 0; i < size; i++) {
Reader reader = (Reader) readers.elementAt(i);
}
}
- throw ReaderException.getInstance();
+ throw NotFoundException.getNotFoundInstance();
}
}