@carviz/capacitor-camera-preview 7.0.0 → 7.0.2

package/CarvizCapacitorCameraPreview.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.author = package['author']
   s.source = { :git => 'https://github.com/GetCarviz/capacitor-camera-preview.git', :tag => s.version.to_s }
   s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
-  s.ios.deployment_target  = '13.0'
+  s.ios.deployment_target  = '14.0'
   s.dependency 'Capacitor'
   s.swift_version = '5.1'
 end

package/ios/Plugin/CameraController.swift

@@ -152,7 +152,7 @@ class CameraController: NSObject {
             // Note that zoomFactor 2 "equals" the regular 1x zoom factor of the native iphone camera app
             // 0.5x however equal a videoZoomFactor of 1. We do not want to use ultra wide angle by default
             // the default videoZoomFactor to 2 in case the current camera device type is .builtInTripleCamera
-            cameraDevice.videoZoomFactor = 2.0
+            cameraDevice.videoZoomFactor = 1.2
         }
     }
     
@@ -391,17 +391,59 @@ class CameraController: NSObject {
 }
 
 extension UIImage {
-    func fixedOrientation() -> UIImage {
-        if imageOrientation == .up {
-            return self
+    func fixedOrientation() -> UIImage? {
+        guard imageOrientation != UIImage.Orientation.up else {
+            // This is default orientation, don't need to do anything
+            return self.copy() as? UIImage
+        }
+
+        guard let cgImage = self.cgImage else {
+            // CGImage is not available
+            return nil
+        }
+
+        guard let colorSpace = cgImage.colorSpace, let ctx = CGContext(data: nil, width: Int(size.width), height: Int(size.height), bitsPerComponent: cgImage.bitsPerComponent, bytesPerRow: 0, space: colorSpace, bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue) else {
+            // Not able to create CGContext
+            return nil
+        }
+
+        var transform: CGAffineTransform = CGAffineTransform.identity
+        
+        switch imageOrientation {
+        case .down, .downMirrored:
+            transform = transform.translatedBy(x: size.width, y: size.height)
+            transform = transform.rotated(by: CGFloat.pi)
+            print("down")
+            break
+        case .left, .leftMirrored:
+            transform = transform.translatedBy(x: size.width, y: 0)
+            transform = transform.rotated(by: CGFloat.pi / 2.0)
+            print("left")
+            break
+        case .right, .rightMirrored:
+            transform = transform.translatedBy(x: 0, y: size.height)
+            transform = transform.rotated(by: CGFloat.pi / -2.0)
+            print("right")
+            break
+        case .up, .upMirrored:
+            break
+        @unknown default:
+            break
+        }
+
+        ctx.concatenate(transform)
+
+        switch imageOrientation {
+        case .left, .leftMirrored, .right, .rightMirrored:
+            ctx.draw(self.cgImage!, in: CGRect(x: 0, y: 0, width: size.height, height: size.width))
+        default:
+            ctx.draw(self.cgImage!, in: CGRect(x: 0, y: 0, width: size.width, height: size.height))
+            break
         }
         
-        UIGraphicsBeginImageContextWithOptions(size, false, scale)
-        draw(in: CGRect(origin: .zero, size: size))
-        let normalizedImage = UIGraphicsGetImageFromCurrentImageContext()!
-        UIGraphicsEndImageContext()
+        guard let newCGImage = ctx.makeImage() else { return nil }
         
-        return normalizedImage
+        return UIImage.init(cgImage: newCGImage, scale: 1, orientation: .up)
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carviz/capacitor-camera-preview",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Fork of the capacitor-community/camera-preview plugin focusing on high resolution photos without bloating up the code.",
   "type": "module",
   "main": "dist/plugin.cjs.js",
@@ -23,7 +23,7 @@
     "prepublishOnly": "npm run build",
     "prepare": "husky && npm run build"
   },
-  "author": "Michael Wolz",
+  "author": "Evan Barberousse",
   "license": "MIT",
   "devDependencies": {
     "@capacitor/android": "^7.0.1",

package/ios/Plugin/UIImage.swift

@@ -1,56 +0,0 @@
-extension UIImage {
-    func fixedOrientation() -> UIImage? {
-        guard imageOrientation != UIImage.Orientation.up else {
-            // This is default orientation, don't need to do anything
-            return self.copy() as? UIImage
-        }
-
-        guard let cgImage = self.cgImage else {
-            // CGImage is not available
-            return nil
-        }
-
-        guard let colorSpace = cgImage.colorSpace, let ctx = CGContext(data: nil, width: Int(size.width), height: Int(size.height), bitsPerComponent: cgImage.bitsPerComponent, bytesPerRow: 0, space: colorSpace, bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue) else {
-            // Not able to create CGContext
-            return nil
-        }
-
-        var transform: CGAffineTransform = CGAffineTransform.identity
-        
-        switch imageOrientation {
-        case .down, .downMirrored:
-            transform = transform.translatedBy(x: size.width, y: size.height)
-            transform = transform.rotated(by: CGFloat.pi)
-            print("down")
-            break
-        case .left, .leftMirrored:
-            transform = transform.translatedBy(x: size.width, y: 0)
-            transform = transform.rotated(by: CGFloat.pi / 2.0)
-            print("left")
-            break
-        case .right, .rightMirrored:
-            transform = transform.translatedBy(x: 0, y: size.height)
-            transform = transform.rotated(by: CGFloat.pi / -2.0)
-            print("right")
-            break
-        case .up, .upMirrored:
-            break
-        @unknown default:
-            break
-        }
-
-        ctx.concatenate(transform)
-
-        switch imageOrientation {
-        case .left, .leftMirrored, .right, .rightMirrored:
-            ctx.draw(self.cgImage!, in: CGRect(x: 0, y: 0, width: size.height, height: size.width))
-        default:
-            ctx.draw(self.cgImage!, in: CGRect(x: 0, y: 0, width: size.width, height: size.height))
-            break
-        }
-        
-        guard let newCGImage = ctx.makeImage() else { return nil }
-        
-        return UIImage.init(cgImage: newCGImage, scale: 1, orientation: .up)
-    }
-}