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 1 Packages Projects Releases Wiki Activity

Issue #202 correctly report absolute ResultPoint coordinates

Browse source
This commit is contained in:
Sean Owen 2014-08-18 00:23:49 +01:00
parent 0d196cc40c
commit 0111b72eaa
1 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
core/src/main/java/com/google/zxing/multi/ByQuadrantReader.java
View file

@ -23,6 +23,7 @@ import com.google.zxing.FormatException;
import com.google.zxing.NotFoundException; import com.google.zxing.NotFoundException;
import com.google.zxing.Reader; import com.google.zxing.Reader;
import com.google.zxing.Result; import com.google.zxing.Result;
import com.google.zxing.ResultPoint;
import java.util.Map; import java.util.Map;
@ -58,30 +59,33 @@ public final class ByQuadrantReader implements Reader {
int halfWidth = width / 2; int halfWidth = width / 2;
int halfHeight = height / 2; int halfHeight = height / 2;
BinaryBitmap topLeft = image.crop(0, 0, halfWidth, halfHeight);
try { try {
return delegate.decode(topLeft, hints); // No need to call makeAbsolute as results will be relative to original top left here
return delegate.decode(image.crop(0, 0, halfWidth, halfHeight), hints);
} catch (NotFoundException re) { } catch (NotFoundException re) {
// continue // continue
} }
BinaryBitmap topRight = image.crop(halfWidth, 0, halfWidth, halfHeight);
try { try {
return delegate.decode(topRight, hints); Result result = delegate.decode(image.crop(halfWidth, 0, halfWidth, halfHeight), hints);
makeAbsolute(result.getResultPoints(), halfWidth, 0);
return result;
} catch (NotFoundException re) { } catch (NotFoundException re) {
// continue // continue
} }
BinaryBitmap bottomLeft = image.crop(0, halfHeight, halfWidth, halfHeight);
try { try {
return delegate.decode(bottomLeft, hints); Result result = delegate.decode(image.crop(0, halfHeight, halfWidth, halfHeight), hints);
makeAbsolute(result.getResultPoints(), 0, halfHeight);
return result;
} catch (NotFoundException re) { } catch (NotFoundException re) {
// continue // continue
} }
BinaryBitmap bottomRight = image.crop(halfWidth, halfHeight, halfWidth, halfHeight);
try { try {
return delegate.decode(bottomRight, hints); Result result = delegate.decode(image.crop(halfWidth, halfHeight, halfWidth, halfHeight), hints);
makeAbsolute(result.getResultPoints(), halfWidth, halfHeight);
return result;
} catch (NotFoundException re) { } catch (NotFoundException re) {
// continue // continue
} }
@ -89,7 +93,9 @@ public final class ByQuadrantReader implements Reader {
int quarterWidth = halfWidth / 2; int quarterWidth = halfWidth / 2;
int quarterHeight = halfHeight / 2; int quarterHeight = halfHeight / 2;
BinaryBitmap center = image.crop(quarterWidth, quarterHeight, halfWidth, halfHeight); BinaryBitmap center = image.crop(quarterWidth, quarterHeight, halfWidth, halfHeight);
return delegate.decode(center, hints); Result result = delegate.decode(center, hints);
makeAbsolute(result.getResultPoints(), quarterWidth, quarterHeight);
return result;
} }
@Override @Override
@ -97,4 +103,13 @@ public final class ByQuadrantReader implements Reader {
delegate.reset(); delegate.reset();
} }
private static void makeAbsolute(ResultPoint[] points, int leftOffset, int topOffset) {
if (points != null) {
for (int i = 0; i < points.length; i++) {
ResultPoint relative = points[i];
points[i] = new ResultPoint(relative.getX() + leftOffset, relative.getY() + topOffset);
}
}
}
} }