/*
- * Copyright 2007 Google Inc.
+ * Copyright 2007 ZXing authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import com.google.zxing.ReaderException;
import com.google.zxing.Result;
import com.google.zxing.ResultPoint;
+import com.google.zxing.ResultMetadataType;
import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.DecoderResult;
import com.google.zxing.common.DetectorResult;
import com.google.zxing.qrcode.decoder.Decoder;
import com.google.zxing.qrcode.detector.Detector;
/**
* This implementation can detect and decode QR Codes in an image.
*
- * @author srowen@google.com (Sean Owen)
+ * @author Sean Owen
*/
-public final class QRCodeReader implements Reader {
+public class QRCodeReader implements Reader {
private static final ResultPoint[] NO_POINTS = new ResultPoint[0];
private final Decoder decoder = new Decoder();
+ protected Decoder getDecoder() {
+ return decoder;
+ }
+
/**
* Locates and decodes a QR code in an image.
*
public Result decode(MonochromeBitmapSource image, Hashtable hints)
throws ReaderException {
- String text;
+ DecoderResult decoderResult;
ResultPoint[] points;
if (hints != null && hints.containsKey(DecodeHintType.PURE_BARCODE)) {
BitMatrix bits = extractPureBits(image);
- text = decoder.decode(bits);
+ decoderResult = decoder.decode(bits);
points = NO_POINTS;
} else {
- DetectorResult result = new Detector(image).detect();
- text = decoder.decode(result.getBits());
- points = result.getPoints();
+ DetectorResult detectorResult = new Detector(image).detect(hints);
+ decoderResult = decoder.decode(detectorResult.getBits());
+ points = detectorResult.getPoints();
+ }
+
+ Result result = new Result(decoderResult.getText(), decoderResult.getRawBytes(), points, BarcodeFormat.QR_CODE);
+ if (decoderResult.getByteSegments() != null) {
+ result.putMetadata(ResultMetadataType.BYTE_SEGMENTS, decoderResult.getByteSegments());
}
- return new Result(text, points, BarcodeFormat.QR_CODE);
+ return result;
}
/**
* around it. This is a specialized method that works exceptionally fast in this special
* case.
*/
- private static BitMatrix extractPureBits(MonochromeBitmapSource image)
- throws ReaderException {
+ private static BitMatrix extractPureBits(MonochromeBitmapSource image) throws ReaderException {
// Now need to determine module size in pixels
+ int height = image.getHeight();
+ int width = image.getWidth();
+ int minDimension = Math.min(height, width);
+
// First, skip white border by tracking diagonally from the top left down and to the right:
int borderWidth = 0;
- while (!image.isBlack(borderWidth, borderWidth)) {
+ while (borderWidth < minDimension && !image.isBlack(borderWidth, borderWidth)) {
borderWidth++;
}
+ if (borderWidth == minDimension) {
+ throw ReaderException.getInstance();
+ }
+
// And then keep tracking across the top-left black module to determine module size
int moduleEnd = borderWidth;
- while (image.isBlack(moduleEnd, moduleEnd)) {
+ while (moduleEnd < minDimension && image.isBlack(moduleEnd, moduleEnd)) {
moduleEnd++;
}
+ if (moduleEnd == minDimension) {
+ throw ReaderException.getInstance();
+ }
+
int moduleSize = moduleEnd - borderWidth;
// And now find where the rightmost black module on the first row ends
- int rowEndOfSymbol = image.getWidth() - 1;
- while (!image.isBlack(rowEndOfSymbol, borderWidth)) {
+ int rowEndOfSymbol = width - 1;
+ while (rowEndOfSymbol >= 0 && !image.isBlack(rowEndOfSymbol, borderWidth)) {
rowEndOfSymbol--;
}
+ if (rowEndOfSymbol < 0) {
+ throw ReaderException.getInstance();
+ }
rowEndOfSymbol++;
// Make sure width of barcode is a multiple of module size
if ((rowEndOfSymbol - borderWidth) % moduleSize != 0) {
- throw new ReaderException("Bad module size / width: " + moduleSize +
- " / " + (rowEndOfSymbol - borderWidth));
+ throw ReaderException.getInstance();
}
int dimension = (rowEndOfSymbol - borderWidth) / moduleSize;
// little off, this will help recover.
borderWidth += moduleSize >> 1;
+ int sampleDimension = borderWidth + (dimension - 1) * moduleSize;
+ if (sampleDimension >= width || sampleDimension >= height) {
+ throw ReaderException.getInstance();
+ }
+
// Now just read off the bits
BitMatrix bits = new BitMatrix(dimension);
for (int i = 0; i < dimension; i++) {