Skip to content

Commit

Permalink
Merge pull request #2365 from danieldaquino/#2341
Browse files Browse the repository at this point in the history
Fix crash with blurhashes with reported dimension of 0x0
  • Loading branch information
danieldaquino authored Aug 8, 2024
2 parents 774da23 + 6480023 commit 49c8d63
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions damus/Util/Images/ImageMetadata.swift
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ struct ImageMetadata: Equatable {

func process_blurhash(blurhash: String, size: CGSize?) async -> UIImage? {
let res = Task.detached(priority: .low) {
let size = get_blurhash_size(img_size: size ?? CGSize(width: 100.0, height: 100.0))
let default_size = CGSize(width: 100.0, height: 100.0)
let size = get_blurhash_size(img_size: size ?? default_size) ?? default_size
guard let img = UIImage.init(blurHash: blurhash, size: size) else {
let noimg: UIImage? = nil
return noimg
Expand Down Expand Up @@ -135,7 +136,8 @@ extension UIImage {
}
}

func get_blurhash_size(img_size: CGSize) -> CGSize {
func get_blurhash_size(img_size: CGSize) -> CGSize? {
guard img_size.width > 0 && img_size.height > 0 else { return nil }
return CGSize(width: 100.0, height: (100.0/img_size.width) * img_size.height)
}

Expand All @@ -145,7 +147,7 @@ func calculate_blurhash(img: UIImage) async -> String? {
}

let res = Task.detached(priority: .low) {
let bhs = get_blurhash_size(img_size: img.size)
let bhs = get_blurhash_size(img_size: img.size) ?? CGSize(width: 100.0, height: 100.0)
let smaller = img.resized(to: bhs)

guard let blurhash = smaller.blurHash(numberOfComponents: (5,5)) else {
Expand Down

0 comments on commit 49c8d63

Please sign in to comment.