Skip to content

Don't Read the ICC profile from the decoded image in the case we are on iOS #16

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

Closed
wants to merge 3 commits into from
Closed

Don't Read the ICC profile from the decoded image in the case we are on iOS #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b11f8af
In iOS/Watch we don't need to read the ICC profile from the encoded i…
punty May 21, 2019
0d5f3e1
Fix code identations
punty May 21, 2019
6c27577
Ignore sharedData
punty May 21, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ DerivedData/
*.perspectivev3
!default.perspectivev3
xcuserdata/
xcshareddata/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ohh, This also shouldn't be added to this place! You can see #2585 firstly.

## Other
*.moved-aside
Expand Down
3 changes: 0 additions & 3 deletions SDWebImageWebPCoder.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion SDWebImageWebPCoder/Classes/SDImageWebPCoder.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,10 +419,16 @@ - (NSTimeInterval)sd_frameDurationWithIterator:(WebPIterator)iter {

// Create and return the correct colorspace by checking the ICC Profile
- (nonnull CGColorSpaceRef)sd_colorSpaceWithDemuxer:(nonnull WebPDemuxer *)demuxer CF_RETURNS_RETAINED {
CGColorSpaceRef colorSpaceRef = NULL;
#if SD_UIKIT || SD_WATCH
colorSpaceRef = [SDImageCoderHelper colorSpaceGetDeviceRGB];
CGColorSpaceRetain(colorSpaceRef);
return colorSpaceRef;
#else
// WebP contains ICC Profile should use the desired colorspace, instead of default device colorspace
// See: https://developers.google.com/speed/webp/docs/riff_container#color_profile

CGColorSpaceRef colorSpaceRef = NULL;

uint32_t flags = WebPDemuxGetI(demuxer, WEBP_FF_FORMAT_FLAGS);

if (flags & ICCP_FLAG) {
Expand Down Expand Up @@ -451,6 +457,7 @@ - (nonnull CGColorSpaceRef)sd_colorSpaceWithDemuxer:(nonnull WebPDemuxer *)demux
}

return colorSpaceRef;
#endif
}

#pragma mark - Encode
Expand Down