projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small style stuff
[zxing.git]
/
core
/
src
/
com
/
google
/
zxing
/
qrcode
/
QRCodeReader.java
diff --git
a/core/src/com/google/zxing/qrcode/QRCodeReader.java
b/core/src/com/google/zxing/qrcode/QRCodeReader.java
index
575af1f
..
2a12c6d
100644
(file)
--- a/
core/src/com/google/zxing/qrcode/QRCodeReader.java
+++ b/
core/src/com/google/zxing/qrcode/QRCodeReader.java
@@
-118,6
+118,9
@@
public class QRCodeReader implements Reader {
}
int moduleSize = x - leftTopBlack[0];
}
int moduleSize = x - leftTopBlack[0];
+ if (moduleSize == 0) {
+ throw NotFoundException.getNotFoundInstance();
+ }
// And now find where the rightmost black module on the first row ends
int rowEndOfSymbol = width - 1;
// And now find where the rightmost black module on the first row ends
int rowEndOfSymbol = width - 1;
@@
-137,9
+140,10
@@
public class QRCodeReader implements Reader {
// Push in the "border" by half the module width so that we start
// sampling in the middle of the module. Just in case the image is a
// Push in the "border" by half the module width so that we start
// sampling in the middle of the module. Just in case the image is a
- // little off, this will help recover.
- x -= moduleSize >> 1;
- y -= moduleSize >> 1;
+ // little off, this will help recover. Need to back up at least 1.
+ int backOffAmount = moduleSize == 1 ? 1 : moduleSize >> 1;
+ x -= backOffAmount;
+ y -= backOffAmount;
if ((x + (dimension - 1) * moduleSize) >= width ||
(y + (dimension - 1) * moduleSize) >= height) {
if ((x + (dimension - 1) * moduleSize) >= width ||
(y + (dimension - 1) * moduleSize) >= height) {
@@
-159,4
+163,4
@@
public class QRCodeReader implements Reader {
return bits;
}
return bits;
}
-}
\ No newline at end of file
+}