Enable DataMatrix in the web app / other small tweaks

[zxing.git] / core / src / com / google / zxing / qrcode / detector / FinderPattern.java

diff --git a/core/src/com/google/zxing/qrcode/detector/FinderPattern.java b/core/src/com/google/zxing/qrcode/detector/FinderPattern.java
index 3df26cf..a339cae 100644 (file)
--- a/core/src/com/google/zxing/qrcode/detector/FinderPattern.java
+++ b/core/src/com/google/zxing/qrcode/detector/FinderPattern.java
@@ -64,10 +64,11 @@ public final class FinderPattern implements ResultPoint {
    * position and size -- meaning, it is at nearly the same center with nearly the same size.</p>
    */
   boolean aboutEquals(float moduleSize, float i, float j) {
-    return Math.abs(i - posY) <= moduleSize &&
-        Math.abs(j - posX) <= moduleSize &&
-        (Math.abs(moduleSize - estimatedModuleSize) <= 1.0f ||
-            Math.abs(moduleSize - estimatedModuleSize) / estimatedModuleSize <= 0.1f);
+    if (Math.abs(i - posY) <= moduleSize && Math.abs(j - posX) <= moduleSize) {
+      float moduleSizeDiff = Math.abs(moduleSize - estimatedModuleSize);
+      return moduleSizeDiff <= 1.0f || moduleSizeDiff / estimatedModuleSize <= 1.0f;
+    }
+    return false;
   }
 
 }