- // Advance to next black pixel\r
- do {\r
- j++;\r
- } while (j < maxJ && !image.get(j, i));\r
- j--; // back up to that last white pixel\r
+ stateCount[0] = stateCount[2];\r
+ stateCount[1] = stateCount[3];\r
+ stateCount[2] = stateCount[4];\r
+ stateCount[3] = 1;\r
+ stateCount[4] = 0;\r
+ currentState = 3;\r
+ continue;\r
}\r
// Clear state to start looking again\r
currentState = 0;\r
}\r
// Clear state to start looking again\r
currentState = 0;\r
if (startSize > 3) {\r
// But we can only afford to do so if we have at least 4 possibilities to choose from\r
float totalModuleSize = 0.0f;\r
if (startSize > 3) {\r
// But we can only afford to do so if we have at least 4 possibilities to choose from\r
float totalModuleSize = 0.0f;\r
for (int i = 0; i < startSize; i++) {\r
for (int i = 0; i < startSize; i++) {\r
- totalModuleSize += ((FinderPattern) possibleCenters.elementAt(i)).getEstimatedModuleSize();\r
+ float size = ((FinderPattern) possibleCenters.elementAt(i)).getEstimatedModuleSize();\r
+ totalModuleSize += size;\r
+ square += size * size;\r
}\r
float average = totalModuleSize / (float) startSize;\r
}\r
float average = totalModuleSize / (float) startSize;\r
+ float stdDev = (float) Math.sqrt(square / startSize - average * average);\r
+\r
+ Collections.insertionSort(possibleCenters, new FurthestFromAverageComparator(average));\r
+\r
+ float limit = Math.max(0.2f * average, stdDev);\r
+\r
for (int i = 0; i < possibleCenters.size() && possibleCenters.size() > 3; i++) {\r
FinderPattern pattern = (FinderPattern) possibleCenters.elementAt(i);\r
for (int i = 0; i < possibleCenters.size() && possibleCenters.size() > 3; i++) {\r
FinderPattern pattern = (FinderPattern) possibleCenters.elementAt(i);\r
- if (Math.abs(pattern.getEstimatedModuleSize() - average) > 0.2f * average) {\r
+ if (Math.abs(pattern.getEstimatedModuleSize() - average) > limit) {\r
possibleCenters.removeElementAt(i);\r
i--;\r
}\r
possibleCenters.removeElementAt(i);\r
i--;\r
}\r
\r
if (possibleCenters.size() > 3) {\r
// Throw away all but those first size candidate points we found.\r
\r
if (possibleCenters.size() > 3) {\r
// Throw away all but those first size candidate points we found.\r
- Collections.insertionSort(possibleCenters, new CenterComparator()); \r
+\r
+ float totalModuleSize = 0.0f;\r
+ for (int i = 0; i < possibleCenters.size(); i++) {\r
+ totalModuleSize += ((FinderPattern) possibleCenters.elementAt(i)).getEstimatedModuleSize();\r
+ }\r
+\r
+ float average = totalModuleSize / (float) possibleCenters.size();\r
+\r
+ Collections.insertionSort(possibleCenters, new CenterComparator(average));\r
+\r
possibleCenters.setSize(3);\r
}\r
\r
possibleCenters.setSize(3);\r
}\r
\r
+ /**\r
+ * <p>Orders by furthest from average</p>\r
+ */\r
+ private static class FurthestFromAverageComparator implements Comparator {\r
+ private final float average;\r
+ public FurthestFromAverageComparator(float f) {\r
+ average = f;\r
+ }\r
+ public int compare(Object center1, Object center2) {\r
+ float dA = Math.abs(((FinderPattern) center2).getEstimatedModuleSize() - average);\r
+ float dB = Math.abs(((FinderPattern) center1).getEstimatedModuleSize() - average);\r
+ return dA < dB ? -1 : (dA == dB ? 0 : 1);\r
+ }\r
+ }\r
+\r
/**\r
* <p>Orders by {@link FinderPattern#getCount()}, descending.</p>\r
*/\r
private static class CenterComparator implements Comparator {\r
/**\r
* <p>Orders by {@link FinderPattern#getCount()}, descending.</p>\r
*/\r
private static class CenterComparator implements Comparator {\r
+ private final float average;\r
+ public CenterComparator(float f) {\r
+ average = f;\r
+ }\r
public int compare(Object center1, Object center2) {\r
public int compare(Object center1, Object center2) {\r
- return ((FinderPattern) center2).getCount() - ((FinderPattern) center1).getCount();\r
+ if (((FinderPattern) center2).getCount() != ((FinderPattern) center1).getCount()) {\r
+ return ((FinderPattern) center2).getCount() - ((FinderPattern) center1).getCount();\r
+ } else {\r
+ float dA = Math.abs(((FinderPattern) center2).getEstimatedModuleSize() - average);\r
+ float dB = Math.abs(((FinderPattern) center1).getEstimatedModuleSize() - average);\r
+ return dA < dB ? 1 : (dA == dB ? 0 : -1);\r
+ }\r
public QRCodeBlackBox2TestCase() {
super("test/data/blackbox/qrcode-2", new MultiFormatReader(), BarcodeFormat.QR_CODE);
addTest(26, 26, 0.0f);
public QRCodeBlackBox2TestCase() {
super("test/data/blackbox/qrcode-2", new MultiFormatReader(), BarcodeFormat.QR_CODE);
addTest(26, 26, 0.0f);
- addTest(25, 25, 90.0f);
- addTest(24, 24, 180.0f);
+ addTest(26, 26, 90.0f);
+ addTest(26, 26, 180.0f);
addTest(25, 25, 270.0f);
}
addTest(25, 25, 270.0f);
}
public QRCodeBlackBox3TestCase() {
super("test/data/blackbox/qrcode-3", new MultiFormatReader(), BarcodeFormat.QR_CODE);
public QRCodeBlackBox3TestCase() {
super("test/data/blackbox/qrcode-3", new MultiFormatReader(), BarcodeFormat.QR_CODE);
addTest(38, 38, 90.0f);
addTest(36, 36, 180.0f);
addTest(38, 38, 90.0f);
addTest(36, 36, 180.0f);
- addTest(37, 37, 270.0f);
+ addTest(38, 38, 270.0f);
public QRCodeBlackBox5TestCase() {
super("test/data/blackbox/qrcode-5", new MultiFormatReader(), BarcodeFormat.QR_CODE);
public QRCodeBlackBox5TestCase() {
super("test/data/blackbox/qrcode-5", new MultiFormatReader(), BarcodeFormat.QR_CODE);
- addTest(18, 18, 180.0f);
- addTest(18, 18, 270.0f);
+ addTest(19, 19, 180.0f);
+ addTest(19, 19, 270.0f);