mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor improvements

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@47 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2007-11-16 16:56:03 +00:00
parent 7ab9de8fd8
commit 57c5bc3b8e
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,7 @@ final class FinderPatternFinder {
*/
FinderPatternFinder(MonochromeBitmapSource image) {
this.image = image;
this.possibleCenters = new Vector(5);
this.possibleCenters = new Vector();
}
FinderPatternInfo find() throws ReaderException {
@ -437,12 +437,11 @@ final class FinderPatternFinder {
if (size == 3) {
// Found just enough -- hope these are good!
// toArray() is not available
FinderPattern[] result = new FinderPattern[possibleCenters.size()];
for (int i = 0; i < possibleCenters.size(); i++) {
result[i] = (FinderPattern) possibleCenters.elementAt(i);
}
return result;
return new FinderPattern[] {
(FinderPattern) possibleCenters.elementAt(0),
(FinderPattern) possibleCenters.elementAt(1),
(FinderPattern) possibleCenters.elementAt(2)
};
}
possibleCenters.setSize(size);
@ -459,11 +458,11 @@ final class FinderPatternFinder {
// We don't have java.util.Collections in J2ME
Collections.insertionSort(possibleCenters, new ClosestToAverageComparator(averageModuleSize));
FinderPattern[] result = new FinderPattern[3];
for (int i = 0; i < 3; i++) {
result[i] = (FinderPattern) possibleCenters.elementAt(i);
}
return result;
return new FinderPattern[] {
(FinderPattern) possibleCenters.elementAt(0),
(FinderPattern) possibleCenters.elementAt(1),
(FinderPattern) possibleCenters.elementAt(2)
};
}
/**
@ -511,7 +510,7 @@ final class FinderPatternFinder {
bottomLeft = temp;
}
return new FinderPattern[]{bottomLeft, topLeft, topRight};
return new FinderPattern[] {bottomLeft, topLeft, topRight};
}
/**
@ -536,17 +535,14 @@ final class FinderPatternFinder {
* <p>Orders by variance from average module size, ascending.</p>
*/
private static class ClosestToAverageComparator implements Comparator {
private float averageModuleSize;
private final float averageModuleSize;
private ClosestToAverageComparator(float averageModuleSize) {
this.averageModuleSize = averageModuleSize;
}
public int compare(Object center1, Object center2) {
return
Math.abs(((FinderPattern) center1).getEstimatedModuleSize() - averageModuleSize) <
Math.abs(((FinderPattern) center2).getEstimatedModuleSize() - averageModuleSize) ?
-1 :
return Math.abs(((FinderPattern) center1).getEstimatedModuleSize() - averageModuleSize) <
Math.abs(((FinderPattern) center2).getEstimatedModuleSize() - averageModuleSize) ?
-1 :
1;
}
}