Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: cropToBounds in iOS is always returning a square aspect ratio #19

Merged
merged 1 commit into from
Nov 13, 2023
Merged

fix: cropToBounds in iOS is always returning a square aspect ratio #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions ios/Plugin/VideoEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,28 +95,35 @@ import UIKit
}
}

func cropToBounds(image: UIImage, width: Double, height: Double) -> UIImage {
func cropToBounds(image: UIImage, width: Double? = nil, height: Double? = nil) -> UIImage {
let cgimage = image.cgImage!
let contextImage: UIImage = UIImage(cgImage: cgimage)
let contextSize: CGSize = contextImage.size

// Calculate the aspect ratio based on the provided width and height if available,
// or use contextSize.width and contextSize.height as defaults.
let aspectRatio: CGFloat
if let w = width, let h = height {
aspectRatio = CGFloat(w / h)
} else {
aspectRatio = contextSize.width / contextSize.height
}

var posX: CGFloat = 0.0
var posY: CGFloat = 0.0
var cgwidth: CGFloat = CGFloat(width)
var cgheight: CGFloat = CGFloat(height)

// See what size is longer and create the center off of that
if contextSize.width > contextSize.height {
posX = ((contextSize.width - contextSize.height) / 2)
posY = 0
cgwidth = contextSize.height
cgheight = contextSize.height
var cgwidth: CGFloat = contextSize.width
var cgheight: CGFloat = contextSize.height

// Calculate the new dimensions while preserving the aspect ratio
if contextSize.width / aspectRatio > contextSize.height {
cgwidth = contextSize.height * aspectRatio
} else {
posX = 0
posY = ((contextSize.height - contextSize.width) / 2)
cgwidth = contextSize.width
cgheight = contextSize.width
cgheight = contextSize.width / aspectRatio
}

posX = (contextSize.width - cgwidth) / 2
posY = (contextSize.height - cgheight) / 2

let rect: CGRect = CGRect(x: posX, y: posY, width: cgwidth, height: cgheight)

// Create bitmap image from context using the rect
Expand Down