mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid AIOOBE, again, with over large correction for nudge in corner cases

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2809 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen@gmail.com 2013-05-23 08:59:39 +00:00
parent 8968ca75ce
commit c35e8e38ea
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/com/google/zxing/qrcode/QRCodeReader.java
View file

@ -149,10 +149,18 @@ public class QRCodeReader implements Reader {
// But careful that this does not sample off the edge // But careful that this does not sample off the edge
int nudgedTooFarRight = left + (int) ((matrixWidth - 1) * moduleSize) - (right - 1); int nudgedTooFarRight = left + (int) ((matrixWidth - 1) * moduleSize) - (right - 1);
if (nudgedTooFarRight > 0) { if (nudgedTooFarRight > 0) {
if (nudgedTooFarRight > nudge) {
// Neither way fits; abort
throw NotFoundException.getNotFoundInstance();
}
left -= nudgedTooFarRight; left -= nudgedTooFarRight;
} }
int nudgedTooFarDown = top + (int) ((matrixHeight - 1) * moduleSize) - (bottom - 1); int nudgedTooFarDown = top + (int) ((matrixHeight - 1) * moduleSize) - (bottom - 1);
if (nudgedTooFarDown > 0) { if (nudgedTooFarDown > 0) {
if (nudgedTooFarDown > nudge) {
// Neither way fits; abort
throw NotFoundException.getNotFoundInstance();
}
top -= nudgedTooFarDown; top -= nudgedTooFarDown;
} }