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

Revert the colorSpace naming

This commit is contained in:
zhongwuzw 2019-01-22 12:54:57 +08:00
parent 4c006ad573
commit 5b1ad45889
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
SDWebImage/SDWebImageWebPCoder.m
View File

@ -25,29 +25,6 @@
#endif #endif
#import <Accelerate/Accelerate.h> #import <Accelerate/Accelerate.h>
// Create and return the correct colorspace by checking the ICC Profile
static CGColorSpaceRef SDColorSpaceCreateWithDemuxer(WebPDemuxer *demuxer) {
// 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
WebPChunkIterator chunk_iter;
CGColorSpaceRef colorSpaceRef = NULL;
int result = WebPDemuxGetChunk(demuxer, "ICCP", 1, &chunk_iter);
if (result) {
NSData *profileData = [NSData dataWithBytesNoCopy:(void *)chunk_iter.chunk.bytes length:chunk_iter.chunk.size freeWhenDone:NO];
colorSpaceRef = CGColorSpaceCreateWithICCProfile((__bridge CFDataRef)profileData);
}
WebPDemuxReleaseChunkIterator(&chunk_iter);
if (!colorSpaceRef) {
colorSpaceRef = SDCGColorSpaceGetDeviceRGB();
CGColorSpaceRetain(colorSpaceRef);
}
return colorSpaceRef;
}
@implementation SDWebImageWebPCoder { @implementation SDWebImageWebPCoder {
WebPIDecoder *_idec; WebPIDecoder *_idec;
@ -115,7 +92,7 @@ static CGColorSpaceRef SDColorSpaceCreateWithDemuxer(WebPDemuxer *demuxer) {
CGColorSpaceRef colorSpace = NULL; CGColorSpaceRef colorSpace = NULL;
// ICC profile // ICC profile
if (flags & ICCP_FLAG) { if (flags & ICCP_FLAG) {
colorSpace = SDColorSpaceCreateWithDemuxer(demuxer); colorSpace = [self sd_colorSpaceWithDemuxer:demuxer];
} else { } else {
colorSpace = SDCGColorSpaceGetDeviceRGB(); colorSpace = SDCGColorSpaceGetDeviceRGB();
CGColorSpaceRetain(colorSpace); CGColorSpaceRetain(colorSpace);
@ -365,6 +342,30 @@ static CGColorSpaceRef SDColorSpaceCreateWithDemuxer(WebPDemuxer *demuxer) {
return image; return image;
} }
// Create and return the correct colorspace by checking the ICC Profile
- (nonnull CGColorSpaceRef)sd_colorSpaceWithDemuxer:(nonnull WebPDemuxer *)demuxer CF_RETURNS_RETAINED {
// 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
WebPChunkIterator chunk_iter;
CGColorSpaceRef colorSpaceRef = NULL;
int result = WebPDemuxGetChunk(demuxer, "ICCP", 1, &chunk_iter);
if (result) {
NSData *profileData = [NSData dataWithBytesNoCopy:(void *)chunk_iter.chunk.bytes length:chunk_iter.chunk.size freeWhenDone:NO];
colorSpaceRef = CGColorSpaceCreateWithICCProfile((__bridge CFDataRef)profileData);
}
WebPDemuxReleaseChunkIterator(&chunk_iter);
if (!colorSpaceRef) {
colorSpaceRef = SDCGColorSpaceGetDeviceRGB();
CGColorSpaceRetain(colorSpaceRef);
}
return colorSpaceRef;
}
#pragma mark - Encode #pragma mark - Encode
- (BOOL)canEncodeToFormat:(SDImageFormat)format { - (BOOL)canEncodeToFormat:(SDImageFormat)format {
return (format == SDImageFormatWebP); return (format == SDImageFormatWebP);