Merge pull request #463 from lterminiello/fixArithmeticException

fix ArithmeticException in CameraPreview
journeyapps · Sep 7, 2019 · 1a1c8d0 · 1a1c8d0
2 parents 3133240 + 0e7413e
commit 1a1c8d0
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java
@@ -387,7 +387,17 @@ private void calculateFrames() {
                 frameInPreview.right * previewWidth / surfaceRect.width(),
                 frameInPreview.bottom * previewHeight / surfaceRect.height());
 
-        if (previewFramingRect.width() <= 0 || previewFramingRect.height() <= 0) {
+        if (surfaceRect.width() != 0 && surfaceRect.height() != 0) {
+            previewFramingRect = new Rect(frameInPreview.left * previewWidth / surfaceRect.width(),
+                    frameInPreview.top * previewHeight / surfaceRect.height(),
+                    frameInPreview.right * previewWidth / surfaceRect.width(),
+                    frameInPreview.bottom * previewHeight / surfaceRect.height());
+
+        } else {
+            previewFramingRect = null;
+        }
+
+        if (previewFramingRect == null || previewFramingRect.width() <= 0 || previewFramingRect.height() <= 0) {
             previewFramingRect = null;
             framingRect = null;
             Log.w(TAG, "Preview frame is too small");