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

Fix the behavior of limit width and height for thumbnail pixel size, should not be greater than the size

This commit is contained in:
DreamPiggy 2020-01-10 23:34:55 +08:00
parent 72250f2182
commit f376b5da9a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SDWebImage/Core/SDImageIOAnimatedCoder.m
View File

@ -159,14 +159,16 @@
} }
CGImageRef imageRef; CGImageRef imageRef;
if (CGSizeEqualToSize(thumbnailSize, CGSizeZero) || (pixelWidth <= thumbnailSize.width && pixelHeight <= thumbnailSize.height)) { if (thumbnailSize.width == 0 || thumbnailSize.height == 0 || (pixelWidth <= thumbnailSize.width && pixelHeight <= thumbnailSize.height)) {
imageRef = CGImageSourceCreateImageAtIndex(source, index, NULL); imageRef = CGImageSourceCreateImageAtIndex(source, index, NULL);
} else { } else {
NSMutableDictionary *thumbnailOptions = [NSMutableDictionary dictionary]; NSMutableDictionary *thumbnailOptions = [NSMutableDictionary dictionary];
thumbnailOptions[(__bridge NSString *)kCGImageSourceCreateThumbnailWithTransform] = @(preserveAspectRatio); thumbnailOptions[(__bridge NSString *)kCGImageSourceCreateThumbnailWithTransform] = @(preserveAspectRatio);
CGFloat maxPixelSize; CGFloat maxPixelSize;
if (preserveAspectRatio) { if (preserveAspectRatio) {
if (pixelWidth > pixelHeight) { CGFloat pixelRatio = pixelWidth / pixelHeight;
CGFloat thumbnailRatio = thumbnailSize.width / thumbnailSize.height;
if (pixelRatio > thumbnailRatio) {
maxPixelSize = thumbnailSize.width; maxPixelSize = thumbnailSize.width;
} else { } else {
maxPixelSize = thumbnailSize.height; maxPixelSize = thumbnailSize.height;
@ -237,7 +239,7 @@
#if SD_MAC #if SD_MAC
// If don't use thumbnail, prefers the built-in generation of frames (GIF/APNG) // If don't use thumbnail, prefers the built-in generation of frames (GIF/APNG)
// Which decode frames in time and reduce memory usage // Which decode frames in time and reduce memory usage
if (CGSizeEqualToSize(thumbnailSize, CGSizeZero)) { if (thumbnailSize.width == 0 || thumbnailSize.height == 0) {
SDAnimatedImageRep *imageRep = [[SDAnimatedImageRep alloc] initWithData:data]; SDAnimatedImageRep *imageRep = [[SDAnimatedImageRep alloc] initWithData:data];
NSSize size = NSMakeSize(imageRep.pixelsWide / scale, imageRep.pixelsHigh / scale); NSSize size = NSMakeSize(imageRep.pixelsWide / scale, imageRep.pixelsHigh / scale);
imageRep.size = size; imageRep.size = size;