update
This commit is contained in:
parent
5b1ad45889
commit
c3b0f64017
|
@ -89,14 +89,7 @@
|
||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
CGColorSpaceRef colorSpace = NULL;
|
CGColorSpaceRef colorSpace = [self sd_colorSpaceWithDemuxer:demuxer];
|
||||||
// ICC profile
|
|
||||||
if (flags & ICCP_FLAG) {
|
|
||||||
colorSpace = [self sd_colorSpaceWithDemuxer:demuxer];
|
|
||||||
} else {
|
|
||||||
colorSpace = SDCGColorSpaceGetDeviceRGB();
|
|
||||||
CGColorSpaceRetain(colorSpace);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(flags & ANIMATION_FLAG)) {
|
if (!(flags & ANIMATION_FLAG)) {
|
||||||
// for static single webp image
|
// for static single webp image
|
||||||
|
@ -347,17 +340,19 @@
|
||||||
// WebP contains ICC Profile should use the desired colorspace, instead of default device colorspace
|
// 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
|
// See: https://developers.google.com/speed/webp/docs/riff_container#color_profile
|
||||||
|
|
||||||
WebPChunkIterator chunk_iter;
|
|
||||||
CGColorSpaceRef colorSpaceRef = NULL;
|
CGColorSpaceRef colorSpaceRef = NULL;
|
||||||
|
uint32_t flags = WebPDemuxGetI(demuxer, WEBP_FF_FORMAT_FLAGS);
|
||||||
|
|
||||||
int result = WebPDemuxGetChunk(demuxer, "ICCP", 1, &chunk_iter);
|
if (flags & ICCP_FLAG) {
|
||||||
if (result) {
|
WebPChunkIterator chunk_iter;
|
||||||
NSData *profileData = [NSData dataWithBytesNoCopy:(void *)chunk_iter.chunk.bytes length:chunk_iter.chunk.size freeWhenDone:NO];
|
int result = WebPDemuxGetChunk(demuxer, "ICCP", 1, &chunk_iter);
|
||||||
colorSpaceRef = CGColorSpaceCreateWithICCProfile((__bridge CFDataRef)profileData);
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
WebPDemuxReleaseChunkIterator(&chunk_iter);
|
|
||||||
|
|
||||||
if (!colorSpaceRef) {
|
if (!colorSpaceRef) {
|
||||||
colorSpaceRef = SDCGColorSpaceGetDeviceRGB();
|
colorSpaceRef = SDCGColorSpaceGetDeviceRGB();
|
||||||
CGColorSpaceRetain(colorSpaceRef);
|
CGColorSpaceRetain(colorSpaceRef);
|
||||||
|
|
Loading…
Reference in New Issue