Issue #202 correctly report absolute ResultPoint coordinates

zxing · Aug 17, 2014 · 0111b72 · 0111b72
1 parent 0d196cc
commit 0111b72
Showing 1 changed file with 24 additions and 9 deletions.
diff --git a/core/src/main/java/com/google/zxing/multi/ByQuadrantReader.java b/core/src/main/java/com/google/zxing/multi/ByQuadrantReader.java
@@ -23,6 +23,7 @@
 import com.google.zxing.NotFoundException;
 import com.google.zxing.Reader;
 import com.google.zxing.Result;
+import com.google.zxing.ResultPoint;
 
 import java.util.Map;
 
@@ -58,43 +59,57 @@ public Result decode(BinaryBitmap image, Map<DecodeHintType,?> hints)
     int halfWidth = width / 2;
     int halfHeight = height / 2;
 
-    BinaryBitmap topLeft = image.crop(0, 0, halfWidth, halfHeight);
     try {
-      return delegate.decode(topLeft, hints);
+      // No need to call makeAbsolute as results will be relative to original top left here
+      return delegate.decode(image.crop(0, 0, halfWidth, halfHeight), hints);
     } catch (NotFoundException re) {
       // continue
     }
 
-    BinaryBitmap topRight = image.crop(halfWidth, 0, halfWidth, halfHeight);
     try {
-      return delegate.decode(topRight, hints);
+      Result result = delegate.decode(image.crop(halfWidth, 0, halfWidth, halfHeight), hints);
+      makeAbsolute(result.getResultPoints(), halfWidth, 0);
+      return result;
     } catch (NotFoundException re) {
       // continue
     }
 
-    BinaryBitmap bottomLeft = image.crop(0, halfHeight, halfWidth, halfHeight);
     try {
-      return delegate.decode(bottomLeft, hints);
+      Result result = delegate.decode(image.crop(0, halfHeight, halfWidth, halfHeight), hints);
+      makeAbsolute(result.getResultPoints(), 0, halfHeight);
+      return result;
     } catch (NotFoundException re) {
       // continue
     }
 
-    BinaryBitmap bottomRight = image.crop(halfWidth, halfHeight, halfWidth, halfHeight);
     try {
-      return delegate.decode(bottomRight, hints);
+      Result result = delegate.decode(image.crop(halfWidth, halfHeight, halfWidth, halfHeight), hints);
+      makeAbsolute(result.getResultPoints(), halfWidth, halfHeight);
+      return result;
     } catch (NotFoundException re) {
       // continue
     }
 
     int quarterWidth = halfWidth / 2;
     int quarterHeight = halfHeight / 2;
     BinaryBitmap center = image.crop(quarterWidth, quarterHeight, halfWidth, halfHeight);
-    return delegate.decode(center, hints);
+    Result result = delegate.decode(center, hints);
+    makeAbsolute(result.getResultPoints(), quarterWidth, quarterHeight);
+    return result;
   }
 
   @Override
   public void reset() {
     delegate.reset();
   }
 
+  private static void makeAbsolute(ResultPoint[] points, int leftOffset, int topOffset) {
+    if (points != null) {
+      for (int i = 0; i < points.length; i++) {
+        ResultPoint relative = points[i];
+        points[i] = new ResultPoint(relative.getX() + leftOffset, relative.getY() + topOffset);
+      }
+    }
+  }
+
 }