Skip to content

Commit 1a1c8d0

Browse files
authored
Merge pull request #463 from lterminiello/fixArithmeticException
fix ArithmeticException in CameraPreview
2 parents 3133240 + 0e7413e commit 1a1c8d0

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,17 @@ private void calculateFrames() {
387387
frameInPreview.right * previewWidth / surfaceRect.width(),
388388
frameInPreview.bottom * previewHeight / surfaceRect.height());
389389

390-
if (previewFramingRect.width() <= 0 || previewFramingRect.height() <= 0) {
390+
if (surfaceRect.width() != 0 && surfaceRect.height() != 0) {
391+
previewFramingRect = new Rect(frameInPreview.left * previewWidth / surfaceRect.width(),
392+
frameInPreview.top * previewHeight / surfaceRect.height(),
393+
frameInPreview.right * previewWidth / surfaceRect.width(),
394+
frameInPreview.bottom * previewHeight / surfaceRect.height());
395+
396+
} else {
397+
previewFramingRect = null;
398+
}
399+
400+
if (previewFramingRect == null || previewFramingRect.width() <= 0 || previewFramingRect.height() <= 0) {
391401
previewFramingRect = null;
392402
framingRect = null;
393403
Log.w(TAG, "Preview frame is too small");

0 commit comments

Comments
 (0)