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

Issue 327. Relax decoder assumptions

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1243 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-03-10 11:10:49 +00:00
parent 30f916b3d6
commit 59fbd6564e
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/src/com/google/zxing/pdf417/detector/Detector.java
View file

@ -115,9 +115,7 @@ public final class Detector {
/** /**
* Locate the vertices and the codewords area of a black blob using the Start * Locate the vertices and the codewords area of a black blob using the Start
* and Stop patterns as locators. Assumes that the barcode begins in the left half * and Stop patterns as locators.
* of the image, and ends in the right half.
* TODO: Fix this assumption, allowing the barcode to be anywhere in the image.
* TODO: Scanning every row is very expensive. We should only do this for TRY_HARDER. * TODO: Scanning every row is very expensive. We should only do this for TRY_HARDER.
* *
* @param matrix the scanned barcode image. * @param matrix the scanned barcode image.
@ -134,14 +132,13 @@ public final class Detector {
private static ResultPoint[] findVertices(BitMatrix matrix) { private static ResultPoint[] findVertices(BitMatrix matrix) {
int height = matrix.getHeight(); int height = matrix.getHeight();
int width = matrix.getWidth(); int width = matrix.getWidth();
int halfWidth = width >> 1;
ResultPoint[] result = new ResultPoint[8]; ResultPoint[] result = new ResultPoint[8];
boolean found = false; boolean found = false;
// Top Left // Top Left
for (int i = 0; i < height; i++) { for (int i = 0; i < height; i++) {
int[] loc = findGuardPattern(matrix, 0, i, halfWidth, false, START_PATTERN); int[] loc = findGuardPattern(matrix, 0, i, width, false, START_PATTERN);
if (loc != null) { if (loc != null) {
result[0] = new ResultPoint(loc[0], i); result[0] = new ResultPoint(loc[0], i);
result[4] = new ResultPoint(loc[1], i); result[4] = new ResultPoint(loc[1], i);
@ -153,7 +150,7 @@ public final class Detector {
if (found) { // Found the Top Left vertex if (found) { // Found the Top Left vertex
found = false; found = false;
for (int i = height - 1; i > 0; i--) { for (int i = height - 1; i > 0; i--) {
int[] loc = findGuardPattern(matrix, 0, i, halfWidth, false, START_PATTERN); int[] loc = findGuardPattern(matrix, 0, i, width, false, START_PATTERN);
if (loc != null) { if (loc != null) {
result[1] = new ResultPoint(loc[0], i); result[1] = new ResultPoint(loc[0], i);
result[5] = new ResultPoint(loc[1], i); result[5] = new ResultPoint(loc[1], i);
@ -166,7 +163,7 @@ public final class Detector {
if (found) { // Found the Bottom Left vertex if (found) { // Found the Bottom Left vertex
found = false; found = false;
for (int i = 0; i < height; i++) { for (int i = 0; i < height; i++) {
int[] loc = findGuardPattern(matrix, halfWidth, i, halfWidth, false, STOP_PATTERN); int[] loc = findGuardPattern(matrix, 0, i, width, false, STOP_PATTERN);
if (loc != null) { if (loc != null) {
result[2] = new ResultPoint(loc[1], i); result[2] = new ResultPoint(loc[1], i);
result[6] = new ResultPoint(loc[0], i); result[6] = new ResultPoint(loc[0], i);
@ -179,7 +176,7 @@ public final class Detector {
if (found) { // Found the Top right vertex if (found) { // Found the Top right vertex
found = false; found = false;
for (int i = height - 1; i > 0; i--) { for (int i = height - 1; i > 0; i--) {
int[] loc = findGuardPattern(matrix, halfWidth, i, halfWidth, false, STOP_PATTERN); int[] loc = findGuardPattern(matrix, 0, i, width, false, STOP_PATTERN);
if (loc != null) { if (loc != null) {
result[3] = new ResultPoint(loc[1], i); result[3] = new ResultPoint(loc[1], i);
result[7] = new ResultPoint(loc[0], i); result[7] = new ResultPoint(loc[0], i);