[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 a7263b7f24d90165bf4aa446b70c97cd2f2b0bcc
Author: srowen <srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Wed May 5 21:43:58 2010 +0000

    OK a little too much logging, roll some back
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1338 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/src/com/google/zxing/client/android/CaptureActivityHandler.java b/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
index 38b7eb8..b93af4f 100755
--- a/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
+++ b/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
@@ -90,7 +90,6 @@ public final class CaptureActivityHandler extends Handler {
         activity.handleDecode((Result) message.obj, barcode);
         break;
       case R.id.decode_failed:
-        Log.v(TAG, "Got decode failed message");
         // We're decoding as fast as possible, so when one decode fails, start another.
         state = State.PREVIEW;
         CameraManager.get().requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
diff --git a/android/src/com/google/zxing/client/android/DecodeHandler.java b/android/src/com/google/zxing/client/android/DecodeHandler.java
index e380bb5..52fe14f 100644
--- a/android/src/com/google/zxing/client/android/DecodeHandler.java
+++ b/android/src/com/google/zxing/client/android/DecodeHandler.java
@@ -90,7 +90,6 @@ final class DecodeHandler extends Handler {
       message.sendToTarget();
     } else {
       Message message = Message.obtain(activity.getHandler(), R.id.decode_failed);
-      Log.v(TAG, "Sending decode failed message...");
       message.sendToTarget();
     }
   }
diff --git a/android/src/com/google/zxing/client/android/camera/CameraManager.java b/android/src/com/google/zxing/client/android/camera/CameraManager.java
index a02550a..1acf00e 100755
--- a/android/src/com/google/zxing/client/android/camera/CameraManager.java
+++ b/android/src/com/google/zxing/client/android/camera/CameraManager.java
@@ -176,10 +176,8 @@ public final class CameraManager {
     if (camera != null && previewing) {
       previewCallback.setHandler(handler, message);
       if (useOneShotPreviewCallback) {
-        Log.v(TAG, "Requesting one-shot preview callback");
         camera.setOneShotPreviewCallback(previewCallback);
       } else {
-        Log.v(TAG, "Requesting preview callback");
         camera.setPreviewCallback(previewCallback);
       }
     }
diff --git a/android/src/com/google/zxing/client/android/camera/PreviewCallback.java b/android/src/com/google/zxing/client/android/camera/PreviewCallback.java
index 2b89d3f..0e68dd6 100644
--- a/android/src/com/google/zxing/client/android/camera/PreviewCallback.java
+++ b/android/src/com/google/zxing/client/android/camera/PreviewCallback.java
@@ -49,7 +49,6 @@ final class PreviewCallback implements Camera.PreviewCallback {
     if (previewHandler != null) {
       Message message = previewHandler.obtainMessage(previewMessage, cameraResolution.x,
           cameraResolution.y, data);
-      Log.v(TAG, "Got preview callback; sending message to decoder");
       message.sendToTarget();
       previewHandler = null;
     } else {

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