X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=core%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fqrcode%2Fdetector%2FFinderPatternFinder.java;h=9968f009886915858daf068f9c43afdd46439fbf;hp=ebed5d0699bc2be40d4d8cc7a877eca2446be850;hb=d0920ceb07da310eb8e10f6a11d5590bcb3184ea;hpb=386c120eaa0adb7ec10631fdc84f428832f158a2

diff --git a/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java b/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
index ebed5d06..9968f009 100755
--- a/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
+++ b/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
@@ -553,7 +553,7 @@ public class FinderPatternFinder {
    */
   private static class FurthestFromAverageComparator implements Comparator {
     private final float average;
-    public FurthestFromAverageComparator(float f) {
+    private FurthestFromAverageComparator(float f) {
       average = f;
     }
     public int compare(Object center1, Object center2) {
@@ -568,16 +568,16 @@ public class FinderPatternFinder {
    */
   private static class CenterComparator implements Comparator {
     private final float average;
-    public CenterComparator(float f) {
+    private CenterComparator(float f) {
       average = f;
     }
     public int compare(Object center1, Object center2) {
-      if (((FinderPattern) center2).getCount() != ((FinderPattern) center1).getCount()) {
-        return ((FinderPattern) center2).getCount() - ((FinderPattern) center1).getCount();
-      } else {
+      if (((FinderPattern) center2).getCount() == ((FinderPattern) center1).getCount()) {
         float dA = Math.abs(((FinderPattern) center2).getEstimatedModuleSize() - average);
         float dB = Math.abs(((FinderPattern) center1).getEstimatedModuleSize() - average);
         return dA < dB ? 1 : (dA == dB ? 0 : -1);
+      } else {
+        return ((FinderPattern) center2).getCount() - ((FinderPattern) center1).getCount();
       }
     }
   }