Merge branch 'mbergou-master' into camera_id_support

Author: dm77

core/src/main/java/me/dm7/barcodescanner/core/BarcodeScannerView.java

@@ -65,25 +65,20 @@ public void stopCamera() {
         }
     }
 
-    public synchronized Rect getFramingRectInPreview(int width, int height) {
+    public synchronized Rect getFramingRectInPreview(int previewWidth, int previewHeight) {
         if (mFramingRectInPreview == null) {
             Rect framingRect = mViewFinderView.getFramingRect();
-            if (framingRect == null) {
+            int viewFinderViewWidth = mViewFinderView.getWidth();
+            int viewFinderViewHeight = mViewFinderView.getHeight();
+            if (framingRect == null || viewFinderViewWidth == 0 || viewFinderViewHeight == 0) {
                 return null;
             }
-            Rect rect = new Rect(framingRect);
-            Point screenResolution = DisplayUtils.getScreenResolution(getContext());
-            Point cameraResolution = new Point(width, height);
 
-            if (cameraResolution == null || screenResolution == null) {
-                // Called early, before init even finished
-                return null;
-            }
-
-            rect.left = rect.left * cameraResolution.x / screenResolution.x;
-            rect.right = rect.right * cameraResolution.x / screenResolution.x;
-            rect.top = rect.top * cameraResolution.y / screenResolution.y;
-            rect.bottom = rect.bottom * cameraResolution.y / screenResolution.y;
+            Rect rect = new Rect(framingRect);
+            rect.left = rect.left * previewWidth / viewFinderViewWidth;
+            rect.right = rect.right * previewWidth / viewFinderViewWidth;
+            rect.top = rect.top * previewHeight / viewFinderViewHeight;
+            rect.bottom = rect.bottom * previewHeight / viewFinderViewHeight;
 
             mFramingRectInPreview = rect;
         }

core/src/main/java/me/dm7/barcodescanner/core/CameraUtils.java

@@ -45,4 +45,4 @@ public static boolean isFlashSupported(Camera camera) {
 
         return true;
     }
-}
+}