Merge commit '2cf855b93c84a29c5ceca8d5656907c35992d5d9'

IGRSoft · Oct 28, 2018 · 8fda204 · 8fda204
2 parents a603791 + 2cf855b
commit 8fda204
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/IGRPhotoTweaks/Category/CGImage+IGRPhotoTweakExtension.swift b/IGRPhotoTweaks/Category/CGImage+IGRPhotoTweakExtension.swift
@@ -10,10 +10,10 @@ import Foundation
 
 extension CGImage {
 
-    func transformedImage(_ transform: CGAffineTransform, sourceSize: CGSize, outputWidth: CGFloat, cropSize: CGSize, imageViewSize: CGSize) -> CGImage {
-
-        let aspect: CGFloat = cropSize.height / cropSize.width
-        let outputSize = CGSize(width: outputWidth, height: (outputWidth * aspect))
+    func transformedImage(_ transform: CGAffineTransform, zoomScale: CGFloat, sourceSize: CGSize, cropSize: CGSize, imageViewSize: CGSize) -> CGImage {
+        let expectedWidth = floor(sourceSize.width / imageViewSize.width * cropSize.width) / zoomScale
+        let expectedHeight = floor(sourceSize.height / imageViewSize.height * cropSize.height) / zoomScale
+        let outputSize = CGSize(width: expectedWidth, height: expectedHeight)
         let bitmapBytesPerRow = 0
 
         let context = CGContext(data: nil,

diff --git a/IGRPhotoTweaks/IGRPhotoTweakViewController.swift b/IGRPhotoTweaks/IGRPhotoTweakViewController.swift
@@ -123,8 +123,8 @@ open class IGRPhotoTweakViewController: UIViewController {
 
         if let fixedImage = self.image.cgImageWithFixedOrientation() {
             let imageRef = fixedImage.transformedImage(transform,
+                                                       zoomScale: self.photoView.scrollView.zoomScale,
                                                        sourceSize: self.image.size,
-                                                       outputWidth: self.image.size.width,
                                                        cropSize: self.photoView.cropView.frame.size,
                                                        imageViewSize: self.photoView.photoContentView.bounds.size)