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

Be more forgiving about endpoints that transform to be just off the image

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@128 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2007-12-21 18:32:49 +00:00
parent 3fd38e3893
commit a9e7e3c8ae
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/src/com/google/zxing/qrcode/detector/GridSampler.java
View file

@ -107,20 +107,36 @@ public abstract class GridSampler {
* This method actually only checks the endpoints since the points are assumed to lie * This method actually only checks the endpoints since the points are assumed to lie
* on a line.</p> * on a line.</p>
* *
* <p>This method will actually "nudge" the endpoints back onto the image if they are found to be barely
* (less than 1 pixel) off the image. This accounts for imperfect detection of finder patterns in an image
* where the QR Code runs all the way to the image border.</p>
*
* @param image image into which the points should map * @param image image into which the points should map
* @param points actual points in x1,y1,...,xn,yn form * @param points actual points in x1,y1,...,xn,yn form
* @throws ReaderException if an endpoint is lies outside the image boundaries * @throws ReaderException if an endpoint is lies outside the image boundaries
*/ */
protected static void checkEndpoint(MonochromeBitmapSource image, float[] points) throws ReaderException { protected static void checkEndpoint(MonochromeBitmapSource image, float[] points) throws ReaderException {
int x = (int) points[0]; int width = image.getWidth();
int y = (int) points[1]; int height = image.getHeight();
if (x < 0 || x >= image.getWidth() || y < 0 || y >= image.getHeight()) { checkOneEndpoint(points, (int) points[0], (int) points[1], width, height);
checkOneEndpoint(points, (int) points[points.length - 2], (int) points[points.length - 1], width, height);
}
private static void checkOneEndpoint(float[] points, int x, int y, int width, int height) throws ReaderException {
if (x < -1 || x > width || y < -1 || y > height) {
throw new ReaderException("Transformed point out of bounds at " + x + ',' + y); throw new ReaderException("Transformed point out of bounds at " + x + ',' + y);
} }
x = (int) points[points.length - 2]; if (x == -1) {
y = (int) points[points.length - 1]; points[0] = 0.0f;
if (x < 0 || x >= image.getWidth() || y < 0 || y >= image.getHeight()) { }
throw new ReaderException("Transformed point out of bounds at " + x + ',' + y); if (y == -1) {
points[1] = 0.0f;
}
if (x == width) {
points[0] = width - 1;
}
if (y == height) {
points[1] = height - 1;
} }
} }