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.

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: Correct image size calculation for macOS with NSImage #316

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,29 @@ class Compressor {
func compress(destCreator: () -> CGImageDestination) {
let minWidth = CGFloat(params["minWidth"] as! Int)
let minHeight = CGFloat(params["minHeight"] as! Int)

let srcWidth = image.image.size.width
let srcHeight = image.image.size.height

// NSImage sometimes returns wrong image size. See https://stackoverflow.com/a/9265331/3966361

// NSImage size method returns size information that is screen resolution dependent.
// let srcWidth = image.image.size.width
// let srcHeight = image.image.size.height

// NSImageRep should be used to get the size represented in the actual file image instead.
var srcWidth:CGFloat = 0
var srcHeight:CGFloat = 0

for imageRep in image.image.representations {
let width = CGFloat(imageRep.pixelsWide)
let height = CGFloat(imageRep.pixelsHigh)

if width > srcWidth {
srcWidth = width
}

if height > srcHeight {
srcHeight = height
}
}

let srcRatio = srcWidth / srcHeight
let maxRatio = minWidth / minHeight
Expand Down