From 6968b86fa201bbfbf2d0110780ac819b90713639 Mon Sep 17 00:00:00 2001 From: Robert Svensson Date: Thu, 31 Oct 2019 17:22:47 +0100 Subject: [PATCH] Fix scaling in camera plugin when setting only `height` This fixes a bug where giving a prescribed `height` when scaling results in an image with inverted aspect ratio (i.e. trying to scale a portrait image would yield a landscape result and vice versa). --- .../main/java/com/getcapacitor/plugin/camera/ImageUtils.java | 2 +- ios/Capacitor/Capacitor/Plugins/Camera.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/capacitor/src/main/java/com/getcapacitor/plugin/camera/ImageUtils.java b/android/capacitor/src/main/java/com/getcapacitor/plugin/camera/ImageUtils.java index 9637b010b..f374474f4 100644 --- a/android/capacitor/src/main/java/com/getcapacitor/plugin/camera/ImageUtils.java +++ b/android/capacitor/src/main/java/com/getcapacitor/plugin/camera/ImageUtils.java @@ -33,7 +33,7 @@ public static Bitmap resize(Bitmap bitmap, final int width, final int height) { } else if (width > 0) { return Bitmap.createScaledBitmap(bitmap, width, (int) (width * 1/aspect), false); } else if (height > 0) { - return Bitmap.createScaledBitmap(bitmap, (int)(height * 1/aspect), height, false); + return Bitmap.createScaledBitmap(bitmap, (int) (height * aspect), height, false); } return bitmap; diff --git a/ios/Capacitor/Capacitor/Plugins/Camera.swift b/ios/Capacitor/Capacitor/Plugins/Camera.swift index e1e37bc19..002670dbc 100644 --- a/ios/Capacitor/Capacitor/Plugins/Camera.swift +++ b/ios/Capacitor/Capacitor/Plugins/Camera.swift @@ -265,7 +265,7 @@ public class CAPCameraPlugin : CAPPlugin, UIImagePickerControllerDelegate, UINav if settings.width > 0 { size = CGSize.init(width: Int(settings.width), height: Int(settings.width * (1/aspect))) } else if settings.height > 0 { - size = CGSize.init(width: Int(settings.height * (1/aspect)), height: Int(settings.height)) + size = CGSize.init(width: Int(settings.height * aspect), height: Int(settings.height)) } }