Updated the Android Test app to use a wider viewfinder, to save images as PNGs instea...

[zxing.git] / androidtest / src / com / google / zxing / client / androidtest / CameraManager.java

diff --git a/androidtest/src/com/google/zxing/client/androidtest/CameraManager.java b/androidtest/src/com/google/zxing/client/androidtest/CameraManager.java
index 723a021..865d03b 100755 (executable)
--- a/androidtest/src/com/google/zxing/client/androidtest/CameraManager.java
+++ b/androidtest/src/com/google/zxing/client/androidtest/CameraManager.java
@@ -132,11 +132,11 @@ final class CameraManager {
    */
   public Rect getFramingRect() {
     if (mFramingRect == null) {
-      int size = ((mScreenResolution.x < mScreenResolution.y) ? mScreenResolution.x :
-          mScreenResolution.y) * 3 / 4;
-      int leftOffset = (mScreenResolution.x - size) / 2;
-      int topOffset = (mScreenResolution.y - size) / 2;
-      mFramingRect = new Rect(leftOffset, topOffset, leftOffset + size, topOffset + size);
+      int width = mScreenResolution.x;
+      int height = mScreenResolution.y * 3 / 4;
+      int leftOffset = (mScreenResolution.x - width) / 2;
+      int topOffset = (mScreenResolution.y - height) / 2;
+      mFramingRect = new Rect(leftOffset, topOffset, leftOffset + width, topOffset + height);
     }
     return mFramingRect;
   }