mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert to pre-Cupcake preview callback system since seems to be some collision between the new one and auto-focus callback that stops scanning in some cases. Also, remove a bad version number from search activity?

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1042 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2009-08-26 21:48:52 +00:00
parent c02bd97b6a
commit b05d7601cf
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/src/com/google/zxing/client/android/CameraManager.java
View file

@ -119,7 +119,7 @@ final class CameraManager {
if (mCamera != null && mPreviewing) { if (mCamera != null && mPreviewing) {
mPreviewHandler = handler; mPreviewHandler = handler;
mPreviewMessage = message; mPreviewMessage = message;
mCamera.setOneShotPreviewCallback(previewCallback); mCamera.setPreviewCallback(previewCallback);
} }
} }
@ -176,6 +176,7 @@ final class CameraManager {
*/ */
private final Camera.PreviewCallback previewCallback = new Camera.PreviewCallback() { private final Camera.PreviewCallback previewCallback = new Camera.PreviewCallback() {
public void onPreviewFrame(byte[] data, Camera camera) { public void onPreviewFrame(byte[] data, Camera camera) {
camera.setPreviewCallback(null);
if (mPreviewHandler != null) { if (mPreviewHandler != null) {
Message message = mPreviewHandler.obtainMessage(mPreviewMessage, mScreenResolution.x, Message message = mPreviewHandler.obtainMessage(mPreviewMessage, mScreenResolution.x,
mScreenResolution.y, data); mScreenResolution.y, data);

2
android/src/com/google/zxing/client/android/SearchBookContentsActivity.java
View file

@ -51,7 +51,7 @@ import java.util.List;
public final class SearchBookContentsActivity extends Activity { public final class SearchBookContentsActivity extends Activity {
private static final String TAG = "SearchBookContents"; private static final String TAG = "SearchBookContents";
private static final String USER_AGENT = "ZXing/1.5 (Android)"; private static final String USER_AGENT = "ZXing (Android)";
private NetworkThread mNetworkThread; private NetworkThread mNetworkThread;
private String mISBN; private String mISBN;