Increase maximum desired zoom to 2.5x

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

diff --git a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
index ba375f8..fa10cb5 100644 (file)
--- a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
+++ b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
@@ -40,7 +40,8 @@ import java.io.IOException;
  */
 public final class ZXingMIDlet extends MIDlet {
 
  */
 public final class ZXingMIDlet extends MIDlet {
 

-  private static final int MAX_ZOOM = 200;
+  private static final int NO_ZOOM = 100;
+  private static final int MAX_ZOOM = 250;

 
   private Canvas canvas;
   private Player player;
 
   private Canvas canvas;
   private Player player;


@@ -76,15 +77,17 @@ public final class ZXingMIDlet extends MIDlet {
   }
 
   private static void setZoom(Player player) {
   }
 
   private static void setZoom(Player player) {

-    // zoom up to 2x if possible

     ZoomControl zoomControl = (ZoomControl) player.getControl("javax.microedition.amms.control.camera.ZoomControl");
     if (zoomControl != null) {
     ZoomControl zoomControl = (ZoomControl) player.getControl("javax.microedition.amms.control.camera.ZoomControl");
     if (zoomControl != null) {

+      // We zoom in if possible to encourage the viewer to take a snapshot from a greater distance.
+      // This is a crude way of dealing with the fact that many phone cameras will not focus at a
+      // very close range.

       int maxZoom = zoomControl.getMaxOpticalZoom();
       int maxZoom = zoomControl.getMaxOpticalZoom();

-      if (maxZoom > 100) {
+      if (maxZoom > NO_ZOOM) {

         zoomControl.setOpticalZoom(maxZoom > MAX_ZOOM ? MAX_ZOOM : maxZoom);
       } else {
         int maxDigitalZoom = zoomControl.getMaxDigitalZoom();
         zoomControl.setOpticalZoom(maxZoom > MAX_ZOOM ? MAX_ZOOM : maxZoom);
       } else {
         int maxDigitalZoom = zoomControl.getMaxDigitalZoom();

-        if (maxDigitalZoom > 100) {
+        if (maxDigitalZoom > NO_ZOOM) {

           zoomControl.setDigitalZoom(maxDigitalZoom > MAX_ZOOM ? MAX_ZOOM : maxDigitalZoom);
         }
       }
           zoomControl.setDigitalZoom(maxDigitalZoom > MAX_ZOOM ? MAX_ZOOM : maxDigitalZoom);
         }
       }