diff --git a/core/src/main/java/com/google/zxing/qrcode/detector/FinderPatternFinder.java b/core/src/main/java/com/google/zxing/qrcode/detector/FinderPatternFinder.java index 2ab3e86b0..3800dc439 100755 --- a/core/src/main/java/com/google/zxing/qrcode/detector/FinderPatternFinder.java +++ b/core/src/main/java/com/google/zxing/qrcode/detector/FinderPatternFinder.java @@ -26,6 +26,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -621,6 +622,12 @@ public class FinderPatternFinder { throw NotFoundException.getNotFoundInstance(); } + for (Iterator it = possibleCenters.iterator(); it.hasNext();) { + if (it.next().getCount() < CENTER_QUORUM) { + it.remove(); + } + } + possibleCenters.sort(moduleComparator); double distortion = Double.MAX_VALUE; diff --git a/core/src/test/java/com/google/zxing/maxicode/MaxiCodeBlackBox1TestCase.java b/core/src/test/java/com/google/zxing/maxicode/MaxiCodeBlackBox1TestCase.java index e7e8fa842..ed0265620 100644 --- a/core/src/test/java/com/google/zxing/maxicode/MaxiCodeBlackBox1TestCase.java +++ b/core/src/test/java/com/google/zxing/maxicode/MaxiCodeBlackBox1TestCase.java @@ -32,7 +32,7 @@ public final class MaxiCodeBlackBox1TestCase extends AbstractBlackBoxTestCase { public MaxiCodeBlackBox1TestCase() { super("src/test/resources/blackbox/maxicode-1", new MultiFormatReader(), BarcodeFormat.MAXICODE); addHint(DecodeHintType.PURE_BARCODE); - addTest(1, 1, 0.0f); + addTest(7, 7, 0.0f); } } diff --git a/core/src/test/java/com/google/zxing/maxicode/Maxicode1TestCase.java b/core/src/test/java/com/google/zxing/maxicode/Maxicode1TestCase.java index dde0f29e6..6d3f49b0f 100644 --- a/core/src/test/java/com/google/zxing/maxicode/Maxicode1TestCase.java +++ b/core/src/test/java/com/google/zxing/maxicode/Maxicode1TestCase.java @@ -27,7 +27,7 @@ public final class Maxicode1TestCase extends AbstractBlackBoxTestCase { public Maxicode1TestCase() { super("src/test/resources/blackbox/maxicode-1", new MultiFormatReader(), BarcodeFormat.MAXICODE); - addTest(6, 6, 0.0f); + addTest(7, 7, 0.0f); } } diff --git a/core/src/test/java/com/google/zxing/qrcode/QRCodeBlackBox2TestCase.java b/core/src/test/java/com/google/zxing/qrcode/QRCodeBlackBox2TestCase.java index 7c11dad96..111c2286a 100644 --- a/core/src/test/java/com/google/zxing/qrcode/QRCodeBlackBox2TestCase.java +++ b/core/src/test/java/com/google/zxing/qrcode/QRCodeBlackBox2TestCase.java @@ -28,7 +28,7 @@ public final class QRCodeBlackBox2TestCase extends AbstractBlackBoxTestCase { public QRCodeBlackBox2TestCase() { super("src/test/resources/blackbox/qrcode-2", new MultiFormatReader(), BarcodeFormat.QR_CODE); addTest(31, 31, 0.0f); - addTest(30, 30, 90.0f); + addTest(29, 29, 90.0f); addTest(30, 30, 180.0f); addTest(30, 30, 270.0f); }