Oops passing somewhat too large values for width / height -- were being used as right...

git-svn-id: http://zxing.googlecode.com/svn/trunk@1074 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/core/src/com/google/zxing/multi/ByQuadrantReader.java b/core/src/com/google/zxing/multi/ByQuadrantReader.java
index a7279e2..28386e6 100644 (file)
--- a/core/src/com/google/zxing/multi/ByQuadrantReader.java
+++ b/core/src/com/google/zxing/multi/ByQuadrantReader.java
@@ -58,21 +58,21 @@ public final class ByQuadrantReader implements Reader {
       // continue
     }
 
-    BinaryBitmap topRight = image.crop(halfWidth, 0, width, halfHeight);
+    BinaryBitmap topRight = image.crop(halfWidth, 0, halfWidth, halfHeight);
     try {
       return delegate.decode(topRight, hints);
     } catch (ReaderException re) {
       // continue
     }
 
-    BinaryBitmap bottomLeft = image.crop(0, halfHeight, halfWidth, height);
+    BinaryBitmap bottomLeft = image.crop(0, halfHeight, halfWidth, halfHeight);
     try {
       return delegate.decode(bottomLeft, hints);
     } catch (ReaderException re) {
       // continue
     }
 
-    BinaryBitmap bottomRight = image.crop(halfWidth, halfHeight, width, height);
+    BinaryBitmap bottomRight = image.crop(halfWidth, halfHeight, halfWidth, halfHeight);
     try {
       return delegate.decode(bottomRight, hints);
     } catch (ReaderException re) {
@@ -81,8 +81,7 @@ public final class ByQuadrantReader implements Reader {
 
     int quarterWidth = halfWidth / 2;
     int quarterHeight = halfHeight / 2;
-    BinaryBitmap center = image.crop(quarterWidth, quarterHeight, width - quarterWidth,
-        height - quarterHeight);
+    BinaryBitmap center = image.crop(quarterWidth, quarterHeight, halfWidth, halfHeight);
     return delegate.decode(center, hints);
   }