[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809

[srowen]

The following commit has been merged in the upstream branch:
commit 5db5ca30e7ed3f952f1934c314a9371f2a223eee
Author: srowen <srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Wed Apr 7 07:58:22 2010 +0000

    Look for mot-zoom-values
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1289 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/src/com/google/zxing/client/android/CameraManager.java b/android/src/com/google/zxing/client/android/CameraManager.java
index 33250da..5d7f598 100755
--- a/android/src/com/google/zxing/client/android/CameraManager.java
+++ b/android/src/com/google/zxing/client/android/CameraManager.java
@@ -418,6 +418,24 @@ final class CameraManager {
     return null;
   }
 
+  private static int findBestMotZoomValue(String stringValues, int tenDesiredZoom) {
+    int tenBestValue = 0;
+    for (String stringValue : COMMA_PATTERN.split(stringValues)) {
+      stringValue = stringValue.trim();
+      double value;
+      try {
+        value = Double.parseDouble(stringValue);
+      } catch (NumberFormatException nfe) {
+        return tenDesiredZoom;
+      }
+      int tenValue = (int) (10.0 * value);
+      if (Math.abs(tenDesiredZoom - value) < Math.abs(tenDesiredZoom - tenBestValue)) {
+        tenBestValue = tenValue;
+      }
+    }
+    return tenBestValue;
+  }
+
   private void setFlash(Camera.Parameters parameters) {
     // FIXME: This is a hack to turn the flash off on the Samsung Galaxy.
     parameters.set("flash-value", 2);
@@ -458,10 +476,14 @@ final class CameraManager {
       }
     }
 
+    String motZoomValues = parameters.get("mot-zoom-values");
+    if (motZoomValues != null) {
+      tenDesiredZoom = findBestMotZoomValue(motZoomValues, tenDesiredZoom);
+    }
 
     // Set zoom. This helps encourage the user to pull back.
     // Some devices like the Behold have a zoom parameter
-    if (maxZoomString != null) {
+    if (maxZoomString != null || motZoomValues != null) {
       parameters.set("zoom", String.valueOf(tenDesiredZoom / 10.0));
     }
 

-- 
Multi-format 1D/2D barcode image processing library