mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-10 04:54:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

More intelligence to avoid very deep recursion

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@951 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2009-05-23 10:33:53 +00:00
parent ec77a581d2
commit 4282827336
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/src/com/google/zxing/multi/GenericMultipleBarcodeReader.java
View file

@ -42,6 +42,8 @@ import java.util.Vector;
*/ */
public final class GenericMultipleBarcodeReader implements MultipleBarcodeReader { public final class GenericMultipleBarcodeReader implements MultipleBarcodeReader {
private static final int MIN_DIMENSION_TO_RECUR = 30;
private final Reader delegate; private final Reader delegate;
public GenericMultipleBarcodeReader(Reader delegate) { public GenericMultipleBarcodeReader(Reader delegate) {
@ -78,6 +80,17 @@ public final class GenericMultipleBarcodeReader implements MultipleBarcodeReader
} catch (ReaderException re) { } catch (ReaderException re) {
return; return;
} }
boolean alreadyFound = false;
for (int i = 0; i < results.size(); i++) {
Result existingResult = (Result) results.elementAt(i);
if (existingResult.getText().equals(result.getText())) {
alreadyFound = true;
break;
}
}
if (alreadyFound) {
return;
}
results.addElement(translateResultPoints(result, xOffset, yOffset)); results.addElement(translateResultPoints(result, xOffset, yOffset));
ResultPoint[] resultPoints = result.getResultPoints(); ResultPoint[] resultPoints = result.getResultPoints();
if (resultPoints == null || resultPoints.length == 0) { if (resultPoints == null || resultPoints.length == 0) {
@ -107,19 +120,19 @@ public final class GenericMultipleBarcodeReader implements MultipleBarcodeReader
} }
} }
if (minX > 0) { if (minX > MIN_DIMENSION_TO_RECUR) {
doDecodeMultiple(new CroppedMonochromeBitmapSource(image, 0, 0, (int) minX, height), doDecodeMultiple(new CroppedMonochromeBitmapSource(image, 0, 0, (int) minX, height),
hints, results, 0, 0); hints, results, 0, 0);
} }
if (minY > 0) { if (minY > MIN_DIMENSION_TO_RECUR) {
doDecodeMultiple(new CroppedMonochromeBitmapSource(image, 0, 0, width, (int) minY), doDecodeMultiple(new CroppedMonochromeBitmapSource(image, 0, 0, width, (int) minY),
hints, results, 0, 0); hints, results, 0, 0);
} }
if (maxX < width - 1) { if (maxX < width - MIN_DIMENSION_TO_RECUR) {
doDecodeMultiple(new CroppedMonochromeBitmapSource(image, (int) maxX, 0, width, height), doDecodeMultiple(new CroppedMonochromeBitmapSource(image, (int) maxX, 0, width, height),
hints, results, (int) maxX, 0); hints, results, (int) maxX, 0);
} }
if (maxY < height - 1) { if (maxY < height - MIN_DIMENSION_TO_RECUR) {
doDecodeMultiple(new CroppedMonochromeBitmapSource(image, 0, (int) maxY, width, height), doDecodeMultiple(new CroppedMonochromeBitmapSource(image, 0, (int) maxY, width, height),
hints, results, 0, (int) maxY); hints, results, 0, (int) maxY);
} }