mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-01-12 19:57:27 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small detector simplification that addresses issue 215 and picks up a net +4 more images decoded in tests

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1022 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2009-07-21 09:39:31 +00:00
parent 636c00e844
commit 9f475ac33e
4 changed files with 21 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
View file

@ -480,34 +480,25 @@ public class FinderPatternFinder {
* @throws ReaderException if 3 such finder patterns do not exist * @throws ReaderException if 3 such finder patterns do not exist
*/ */
private FinderPattern[] selectBestPatterns() throws ReaderException { private FinderPattern[] selectBestPatterns() throws ReaderException {
Collections.insertionSort(possibleCenters, new CenterComparator()); if (possibleCenters.size() < 3) {
int size = 0;
int max = possibleCenters.size();
while (size < max) {
if (((FinderPattern) possibleCenters.elementAt(size)).getCount() < CENTER_QUORUM) {
break;
}
size++;
}
if (size < 3) {
// Couldn't find enough finder patterns // Couldn't find enough finder patterns
throw ReaderException.getInstance(); throw ReaderException.getInstance();
} }
Collections.insertionSort(possibleCenters, new CenterComparator());
if (size > 3) { if (possibleCenters.size() > 3) {
// Throw away all but those first size candidate points we found. // Throw away all but those first size candidate points we found.
possibleCenters.setSize(size); possibleCenters.setSize(3);
// We need to pick the best three. Find the most
// popular ones whose module size is nearest the average
float averageModuleSize = 0.0f;
for (int i = 0; i < size; i++) {
averageModuleSize += ((FinderPattern) possibleCenters.elementAt(i)).getEstimatedModuleSize();
}
averageModuleSize /= (float) size;
// We don't have java.util.Collections in J2ME
Collections.insertionSort(possibleCenters, new ClosestToAverageComparator(averageModuleSize));
} }
// We need to pick the best three. Find the most
// popular ones whose module size is nearest the average
float averageModuleSize = 0.0f;
for (int i = 0; i < 3; i++) {
averageModuleSize += ((FinderPattern) possibleCenters.elementAt(i)).getEstimatedModuleSize();
}
averageModuleSize /= 3.0f;
// We don't have java.util.Collections in J2ME
Collections.insertionSort(possibleCenters, new ClosestToAverageComparator(averageModuleSize));
return new FinderPattern[]{ return new FinderPattern[]{
(FinderPattern) possibleCenters.elementAt(0), (FinderPattern) possibleCenters.elementAt(0),

4
core/test/src/com/google/zxing/qrcode/QRCodeBlackBox1TestCase.java
View file

@ -29,8 +29,8 @@ public final class QRCodeBlackBox1TestCase extends AbstractBlackBoxTestCase {
super("test/data/blackbox/qrcode-1", new MultiFormatReader(), BarcodeFormat.QR_CODE); super("test/data/blackbox/qrcode-1", new MultiFormatReader(), BarcodeFormat.QR_CODE);
addTest(19, 19, 0.0f); addTest(19, 19, 0.0f);
addTest(15, 15, 90.0f); addTest(15, 15, 90.0f);
addTest(16, 16, 180.0f); addTest(17, 17, 180.0f);
addTest(13, 14, 270.0f); addTest(14, 14, 270.0f);
} }
} }

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

@ -27,10 +27,10 @@ public final class QRCodeBlackBox2TestCase extends AbstractBlackBoxTestCase {
public QRCodeBlackBox2TestCase() { public QRCodeBlackBox2TestCase() {
super("test/data/blackbox/qrcode-2", new MultiFormatReader(), BarcodeFormat.QR_CODE); super("test/data/blackbox/qrcode-2", new MultiFormatReader(), BarcodeFormat.QR_CODE);
addTest(24, 24, 0.0f); addTest(23, 23, 0.0f);
addTest(21, 21, 90.0f); addTest(20, 20, 90.0f);
addTest(22, 22, 180.0f); addTest(21, 21, 180.0f);
addTest(17, 18, 270.0f); addTest(19, 19, 270.0f);
} }
} }

4
core/test/src/com/google/zxing/qrcode/QRCodeBlackBox3TestCase.java
View file

@ -29,8 +29,8 @@ public final class QRCodeBlackBox3TestCase extends AbstractBlackBoxTestCase {
super("test/data/blackbox/qrcode-3", new MultiFormatReader(), BarcodeFormat.QR_CODE); super("test/data/blackbox/qrcode-3", new MultiFormatReader(), BarcodeFormat.QR_CODE);
addTest(33, 33, 0.0f); addTest(33, 33, 0.0f);
addTest(33, 33, 90.0f); addTest(33, 33, 90.0f);
addTest(32, 32, 180.0f); addTest(33, 33, 180.0f);
addTest(34, 34, 270.0f); addTest(35, 35, 270.0f);
} }
} }