railbird/react-native-vision-camera
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Fix potential bug in Photo Orientation (#1765)

Browse Source
This commit is contained in:
Vojtech Novak 2023-09-06 11:30:58 +02:00 committed by GitHub
parent 6dd1d4147e
commit eddb01fda1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
package/ios/PhotoCaptureDelegate.swift
View File

@ -57,9 +57,10 @@ class PhotoCaptureDelegate: NSObject, AVCapturePhotoCaptureDelegate {
let exif = photo.metadata["{Exif}"] as? [String: Any] let exif = photo.metadata["{Exif}"] as? [String: Any]
let width = exif?["PixelXDimension"] let width = exif?["PixelXDimension"]
let height = exif?["PixelYDimension"] let height = exif?["PixelYDimension"]
let exifOrientation = photo.metadata[kCGImagePropertyOrientation as String] as? Int ?? 0 let exifOrientation = photo.metadata[String(kCGImagePropertyOrientation)] as? UInt32 ?? CGImagePropertyOrientation.up.rawValue
let orientation = getOrientation(forExifOrientation: exifOrientation) let cgOrientation = CGImagePropertyOrientation(rawValue: exifOrientation) ?? CGImagePropertyOrientation.up
let isMirrored = getIsMirrored(forExifOrientation: exifOrientation) let orientation = getOrientation(forExifOrientation: cgOrientation)
let isMirrored = getIsMirrored(forExifOrientation: cgOrientation)
promise.resolve([ promise.resolve([
"path": tempFilePath, "path": tempFilePath,
@ -86,24 +87,24 @@ class PhotoCaptureDelegate: NSObject, AVCapturePhotoCaptureDelegate {
} }
} }
private func getOrientation(forExifOrientation exifOrientation: Int) -> String { private func getOrientation(forExifOrientation exifOrientation: CGImagePropertyOrientation) -> String {
switch exifOrientation { switch exifOrientation {
case 1, 2: case .up, .upMirrored:
return "portrait" return "portrait"
case 3, 4: case .down, .downMirrored:
return "portrait-upside-down" return "portrait-upside-down"
case 5, 6: case .left, .leftMirrored:
return "landscape-left" return "landscape-left"
case 7, 8: case .right, .rightMirrored:
return "landscape-right" return "landscape-right"
default: default:
return "portrait" return "portrait"
} }
} }
private func getIsMirrored(forExifOrientation exifOrientation: Int) -> Bool { private func getIsMirrored(forExifOrientation exifOrientation: CGImagePropertyOrientation) -> Bool {
switch exifOrientation { switch exifOrientation {
case 2, 4, 5, 7: case .upMirrored, .rightMirrored, .downMirrored, .leftMirrored:
return true return true
default: default:
return false return false