Fix image orientation before edit. Optimize image compression method.

Author: zhanglong15

Sources/Extensions/UIImage+ZLImageEditor.swift

@@ -29,6 +29,62 @@ import Accelerate
 
 extension UIImage {
 
+    // 修复转向
+    func fixOrientation() -> UIImage {
+        if self.imageOrientation == .up {
+            return self
+        }
+        
+        var transform = CGAffineTransform.identity
+        
+        switch self.imageOrientation {
+        case .down, .downMirrored:
+            transform = CGAffineTransform(translationX: self.size.width, y: self.size.height)
+            transform = transform.rotated(by: .pi)
+        
+        case .left, .leftMirrored:
+            transform = CGAffineTransform(translationX: self.size.width, y: 0)
+            transform = transform.rotated(by: CGFloat.pi / 2)
+            
+        case .right, .rightMirrored:
+            transform = CGAffineTransform(translationX: 0, y: self.size.height)
+            transform = transform.rotated(by: -CGFloat.pi / 2)
+            
+        default:
+            break
+        }
+        
+        switch self.imageOrientation {
+        case .upMirrored, .downMirrored:
+            transform = transform.translatedBy(x: self.size.width, y: 0)
+            transform = transform.scaledBy(x: -1, y: 1)
+            
+        case .leftMirrored, .rightMirrored:
+            transform = transform.translatedBy(x: self.size.height, y: 0)
+            transform = transform.scaledBy(x: -1, y: 1)
+        
+        default:
+            break
+        }
+        
+        guard let ci = self.cgImage, let colorSpace = ci.colorSpace else {
+            return self
+        }
+        let context = CGContext(data: nil, width: Int(self.size.width), height: Int(self.size.height), bitsPerComponent: ci.bitsPerComponent, bytesPerRow: 0, space: colorSpace, bitmapInfo: ci.bitmapInfo.rawValue)
+        context?.concatenate(transform)
+        switch self.imageOrientation {
+        case .left, .leftMirrored, .right, .rightMirrored:
+            context?.draw(ci, in: CGRect(x: 0, y: 0, width: self.size.height, height: self.size.width))
+        default:
+            context?.draw(ci, in: CGRect(x: 0, y: 0, width: self.size.width, height: self.size.height))
+        }
+        
+        guard let newCgimg = context?.makeImage() else {
+            return self
+        }
+        return UIImage(cgImage: newCgimg)
+    }
+    
     func rotate(orientation: UIImage.Orientation) -> UIImage {
         guard let imagRef = self.cgImage else {
             return self
@@ -247,6 +303,31 @@ extension UIImage {
         return UIImage(cgImage: cgImage)
     }
 
+    func compress(to maxSize: Int) -> UIImage {
+        if let size = self.jpegData(compressionQuality: 1)?.count, size <= maxSize {
+            return self
+        }
+        var min: CGFloat = 0
+        var max: CGFloat = 1
+        var data: Data?
+        for _ in 0..<6 {
+            let mid = (min + max) / 2
+            data = self.jpegData(compressionQuality: mid)
+            let compressSize = data?.count ?? 0
+            if compressSize > maxSize {
+                max = mid
+            } else if compressSize < maxSize {
+                min = mid
+            } else {
+                break
+            }
+        }
+        guard let d = data else {
+            return self
+        }
+        return UIImage(data: d) ?? self
+    }
+    
 }
 
 

Sources/General/ZLEditImageViewController.swift

@@ -203,8 +203,8 @@ public class ZLEditImageViewController: UIViewController {
     }
 
     @objc init(image: UIImage, editModel: ZLEditImageModel? = nil) {
-        self.originalImage = image
-        self.editImage = image
+        self.originalImage = image.fixOrientation()
+        self.editImage = self.originalImage
         self.editRect = editModel?.editRect ?? CGRect(origin: .zero, size: image.size)
         self.drawColors = ZLImageEditorConfiguration.default().editImageDrawColors
         self.currentFilter = editModel?.selectFilter ?? .normal
@@ -678,8 +678,8 @@ public class ZLEditImageViewController: UIViewController {
         if hasEdit {
             resImage = self.buildImage()
             resImage = resImage.clipImage(self.angle, self.editRect) ?? resImage
-            if let resizeImage = resImage.resize_vI(CGSize(width: resImage.size.width / 2, height: resImage.size.height / 2)) {
-                resImage = resizeImage
+            if let oriDataSize = self.originalImage.jpegData(compressionQuality: 1)?.count {
+                resImage = resImage.compress(to: oriDataSize)
             }
         }
         self.editFinishBlock?(resImage, editModel)

Sources/ZLImageEditor.bundle/de.lproj/Localizable.strings

@@ -1,3 +1,4 @@
+"cancel" = "Stornieren";
 "done" = "Erledigt";
 "editFinish" = "Fertig";
 "revert" = "Rückgängig";

Sources/ZLImageEditor.bundle/en.lproj/Localizable.strings

@@ -1,3 +1,4 @@
+"cancel" = "Cancel";
 "done" = "Done";
 "editFinish" = "Done";
 "revert" = "Undo";

Sources/ZLImageEditor.bundle/fr.lproj/Localizable.strings

@@ -1,3 +1,4 @@
+"cancel" = "Annuler";
 "done" = "Terminé";
 "editFinish" = "Terminé";
 "revert" = "Annuler";

Sources/ZLImageEditor.bundle/it.lproj/Localizable.strings

@@ -1,3 +1,4 @@
+"cancel" = "Annulla";
 "done" = "Fine";
 "editFinish" = "Fine";
 "revert" = "Annulla";

Sources/ZLImageEditor.bundle/ja-US.lproj/Localizable.strings

@@ -1,3 +1,4 @@
+"cancel" = "キャンセル";
 "done" = "確定";
 "editFinish" = "完了";
 "revert" = "元に戻す";

Sources/ZLImageEditor.bundle/ko.lproj/Localizable.strings

@@ -1,3 +1,4 @@
+"cancel" = "취소";
 "done" = "끝난";
 "editFinish" = "완료";
 "revert" = "실행 취소";

Sources/ZLImageEditor.bundle/ms.lproj/Localizable.strings

@@ -1,3 +1,4 @@
+"cancel" = "Batal";
 "done" = "Selesai";
 "editFinish" = "Selesai";
 "revert" = "Buat asal";

Sources/ZLImageEditor.bundle/ru.lproj/Localizable.strings

@@ -1,3 +1,4 @@
+"cancel" = "Отмена";
 "done" = "Готово";
 "editFinish" = "Готово";
 "revert" = "Отменить";

Sources/ZLImageEditor.bundle/vi.lproj/Localizable.strings

@@ -1,3 +1,4 @@
+"cancel" = "Huỷ";
 "done" = "Xong";
 "editFinish" = "Xong";
 "revert" = "Hoàn tác";

Sources/ZLImageEditor.bundle/zh-Hans.lproj/Localizable.strings

@@ -1,3 +1,4 @@
+"cancel" = "取消";
 "done" = "确定";
 "editFinish" = "完成";
 "revert" = "还原";

Sources/ZLImageEditor.bundle/zh-Hant.lproj/Localizable.strings

@@ -1,3 +1,4 @@
+"cancel" = "取消";
 "done" = "確定";
 "editFinish" = "完成";
 "revert" = "還原";