mirrors
/
SDWebImageSwiftUI
mirror of https://github.com/rela-tech/SDWebImageSwiftUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #177 from SDWebImage/fix_image_sturct_from_uiimage 

Fix the issue that using `Image(uiimage:)` will result wrong rendering mode in some component like `TabbarItem`, while using `Image(decorative:sclae:orientation:)` works well
This commit is contained in:
DreamPiggy 2021-03-10 18:04:40 +08:00 committed by GitHub
parent 88f2d679b7 f6074c2e5d
commit e19c35a07a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
SDWebImageSwiftUI/Classes/WebImage.swift
View File

@ -123,8 +123,8 @@ public struct WebImage : View {
#if os(macOS)
result = Image(nsImage: image)
#else
// Fix the SwiftUI.Image rendering issue, like when use EXIF UIImage, the `.aspectRatio` does not works. SwiftUI's Bug :)
// See issue #101
// Fix the SwiftUI.Image rendering issue, like when use EXIF UIImage, the `.aspectRatio` does not works. SwiftUI's Bug :). See #101
// Always prefers `Image(decorative:scale:)` but not `Image(uiImage:scale:) to avoid bug on `TabbarItem`. See #175
var cgImage: CGImage?
// Case 1: Vector Image, draw bitmap image
if image.sd_isVector {
@ -144,15 +144,8 @@ public struct WebImage : View {
cgImage = image.cgImage
}
} else {
// Case 2: Image with EXIF orientation (only EXIF 5-8 contains bug)
if [.left, .leftMirrored, .right, .rightMirrored].contains(image.imageOrientation) {
// Fixed by Apple in iOS 14+
if #available(iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
// Do nothing
} else {
cgImage = image.cgImage
}
}
// Case 2: EXIF Image and Bitmap Image, prefers CGImage
cgImage = image.cgImage
}
// If we have CGImage, use CGImage based API, else use UIImage based API
if let cgImage = cgImage {

29
Tests/WebImageTests.swift
View File

@ -22,10 +22,10 @@ class WebImageTests: XCTestCase {
let imageUrl = URL(string: "https://nr-platform.s3.amazonaws.com/uploads/platform/published_extension/branding_icon/275/AmazonS3.png")
let imageView = WebImage(url: imageUrl)
let introspectView = imageView.onSuccess { image, data, cacheType in
#if os(iOS) || os(tvOS)
let displayImage = try? imageView.inspect().group().image(0).uiImage()
#else
#if os(macOS)
let displayImage = try? imageView.inspect().group().image(0).nsImage()
#else
let displayImage = try? imageView.inspect().group().image(0).cgImage()
#endif
XCTAssertNotNil(displayImage)
expectation.fulfill()
@ -46,15 +46,17 @@ class WebImageTests: XCTestCase {
let introspectView = imageView.onSuccess { image, data, cacheType in
if let animatedImage = image as? SDAnimatedImage {
XCTAssertTrue(imageView.isAnimating)
#if os(iOS) || os(tvOS)
let displayImage = try? imageView.inspect().group().image(0).uiImage()
#else
#if os(macOS)
let displayImage = try? imageView.inspect().group().image(0).nsImage()
let size = displayImage?.size
#else
let displayImage = try? imageView.inspect().group().image(0).cgImage()
let size = CGSize(width: displayImage?.width ?? 0, height: displayImage?.height ?? 0)
#endif
XCTAssertNotNil(displayImage)
// Check display image should match the animated poster frame
let posterImage = animatedImage.animatedImageFrame(at: 0)
XCTAssertEqual(displayImage?.size, posterImage?.size)
XCTAssertEqual(size, posterImage?.size)
expectation.fulfill()
} else {
XCTFail("WebImage animated image invalid")
@ -162,15 +164,10 @@ class WebImageTests: XCTestCase {
let displayImage = try? imageView.inspect().group().image(0).nsImage()
XCTAssertNotNil(displayImage)
#else
if #available(iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
let displayImage = try? imageView.inspect().group().image(0).uiImage()
XCTAssertEqual(displayImage, image)
} else {
let displayImage = try? imageView.inspect().group().image(0).cgImage()
let orientation = try? imageView.inspect().group().image(0).orientation()
XCTAssertNotNil(displayImage)
XCTAssertEqual(orientation, .leftMirrored)
}
let displayImage = try? imageView.inspect().group().image(0).cgImage()
let orientation = try? imageView.inspect().group().image(0).orientation()
XCTAssertNotNil(displayImage)
XCTAssertEqual(orientation, .leftMirrored)
#endif
expectation.fulfill()
}.onFailure { error in