shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 78 Pull Requests Releases Wiki Activity

Convert wide-gamut images to sRGB before uploading

This commit is contained in:
Shadowfacts 2022-11-11 21:02:38 -05:00
parent 0413f326a0
commit 5c479e3bf0
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Tusker/Models/CompositionAttachmentData.swift
View File

@ -67,15 +67,24 @@ enum CompositionAttachmentData {
completion(.failure(.missingData)) completion(.failure(.missingData))
return return
} }
let utType: UTType let utType: UTType
if dataUTI == "public.heic" { let image = CIImage(data: data)!
// neither Mastodon nor Pleroma handles HEIC well, so convert to JPEG let needsColorSpaceConversion = image.colorSpace?.name != CGColorSpace.sRGB
let image = CIImage(data: data)!
// neither Mastodon nor Pleroma handles HEIC well, so convert to JPEG
// they also do a bad job converting wide color gamut images (they seem to just drop the profile, letting the wide-gamut values be reinterprete as sRGB)
// if that changes in the future, we'll need to pass the InstanceFeatures in here somehow and gate the conversion
if needsColorSpaceConversion || dataUTI == "public.heic" {
let context = CIContext() let context = CIContext()
let colorSpace = image.colorSpace ?? CGColorSpace(name: CGColorSpace.sRGB)! let sRGB = CGColorSpace(name: CGColorSpace.sRGB)!
data = context.jpegRepresentation(of: image, colorSpace: colorSpace, options: [:])! if dataUTI == "public.png" {
utType = .jpeg data = context.pngRepresentation(of: image, format: .ARGB8, colorSpace: sRGB)!
utType = .png
} else {
data = context.jpegRepresentation(of: image, colorSpace: sRGB)!
utType = .jpeg
}
} else { } else {
utType = UTType(dataUTI)! utType = UTType(dataUTI)!
} }