* @throws ReaderException if 3 such finder patterns do not exist\r
*/\r
private FinderPattern[] selectBestPatterns() throws ReaderException {\r
- Collections.insertionSort(possibleCenters, new CenterComparator());\r
- int size = 0;\r
- int max = possibleCenters.size();\r
- while (size < max) {\r
- if (((FinderPattern) possibleCenters.elementAt(size)).getCount() < CENTER_QUORUM) {\r
- break;\r
- }\r
- size++;\r
- }\r
-\r
- if (size < 3) {\r
+ if (possibleCenters.size() < 3) {\r
// Couldn't find enough finder patterns\r
throw ReaderException.getInstance();\r
}\r
+ Collections.insertionSort(possibleCenters, new CenterComparator());\r
\r
- if (size > 3) {\r
+ if (possibleCenters.size() > 3) {\r
// Throw away all but those first size candidate points we found.\r
- possibleCenters.setSize(size);\r
- // We need to pick the best three. Find the most\r
- // popular ones whose module size is nearest the average\r
- float averageModuleSize = 0.0f;\r
- for (int i = 0; i < size; i++) {\r
- averageModuleSize += ((FinderPattern) possibleCenters.elementAt(i)).getEstimatedModuleSize();\r
- }\r
- averageModuleSize /= (float) size;\r
- // We don't have java.util.Collections in J2ME\r
- Collections.insertionSort(possibleCenters, new ClosestToAverageComparator(averageModuleSize));\r
+ possibleCenters.setSize(3);\r
+ }\r
+ // We need to pick the best three. Find the most\r
+ // popular ones whose module size is nearest the average\r
+ float averageModuleSize = 0.0f;\r
+ for (int i = 0; i < 3; i++) {\r
+ averageModuleSize += ((FinderPattern) possibleCenters.elementAt(i)).getEstimatedModuleSize();\r
}\r
+ averageModuleSize /= 3.0f;\r
+ // We don't have java.util.Collections in J2ME\r
+ Collections.insertionSort(possibleCenters, new ClosestToAverageComparator(averageModuleSize));\r
\r
return new FinderPattern[]{\r
(FinderPattern) possibleCenters.elementAt(0),\r
super("test/data/blackbox/qrcode-1", new MultiFormatReader(), BarcodeFormat.QR_CODE);
addTest(19, 19, 0.0f);
addTest(15, 15, 90.0f);
- addTest(16, 16, 180.0f);
- addTest(13, 14, 270.0f);
+ addTest(17, 17, 180.0f);
+ addTest(14, 14, 270.0f);
}
}
\ No newline at end of file
public QRCodeBlackBox2TestCase() {
super("test/data/blackbox/qrcode-2", new MultiFormatReader(), BarcodeFormat.QR_CODE);
- addTest(24, 24, 0.0f);
- addTest(21, 21, 90.0f);
- addTest(22, 22, 180.0f);
- addTest(17, 18, 270.0f);
+ addTest(23, 23, 0.0f);
+ addTest(20, 20, 90.0f);
+ addTest(21, 21, 180.0f);
+ addTest(19, 19, 270.0f);
}
}
\ No newline at end of file
super("test/data/blackbox/qrcode-3", new MultiFormatReader(), BarcodeFormat.QR_CODE);
addTest(33, 33, 0.0f);
addTest(33, 33, 90.0f);
- addTest(32, 32, 180.0f);
- addTest(34, 34, 270.0f);
+ addTest(33, 33, 180.0f);
+ addTest(35, 35, 270.0f);
}
}
\ No newline at end of file