From 556013145be77e2a5a69c8b0fb0aa0fb02656e5e Mon Sep 17 00:00:00 2001 From: "srowen@gmail.com" Date: Tue, 14 May 2013 11:20:27 +0000 Subject: [PATCH] Avoid weird NPE observed in 4.3.2 git-svn-id: https://zxing.googlecode.com/svn/trunk@2792 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../src/com/google/zxing/client/android/ViewfinderView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/com/google/zxing/client/android/ViewfinderView.java b/android/src/com/google/zxing/client/android/ViewfinderView.java index 050fd5892..05d28f977 100755 --- a/android/src/com/google/zxing/client/android/ViewfinderView.java +++ b/android/src/com/google/zxing/client/android/ViewfinderView.java @@ -82,7 +82,8 @@ public final class ViewfinderView extends View { return; // not ready yet, early draw before done configuring } Rect frame = cameraManager.getFramingRect(); - if (frame == null) { + Rect previewFrame = cameraManager.getFramingRectInPreview(); + if (frame == null || previewFrame == null) { return; } int width = canvas.getWidth(); @@ -108,7 +109,6 @@ public final class ViewfinderView extends View { int middle = frame.height() / 2 + frame.top; canvas.drawRect(frame.left + 2, middle - 1, frame.right - 1, middle + 2, paint); - Rect previewFrame = cameraManager.getFramingRectInPreview(); float scaleX = frame.width() / (float) previewFrame.width(); float scaleY = frame.height() / (float) previewFrame.height();