From 0326c3ebbbff21c0e38ffa6112b27d2ab042729f Mon Sep 17 00:00:00 2001 From: Dylan Vann Date: Tue, 2 Jul 2019 21:30:13 -0400 Subject: [PATCH] fix: Loading images by reverting "bug: Use device scale when loading images.". fix #509 This reverts commit 5cb5d6bab3a8da533114de4b643797a6981c71bd. --- ios/FastImage/FFFastImageView.m | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/ios/FastImage/FFFastImageView.m b/ios/FastImage/FFFastImageView.m index 00d0061a9..82188ffa5 100644 --- a/ios/FastImage/FFFastImageView.m +++ b/ios/FastImage/FFFastImageView.m @@ -69,9 +69,9 @@ - (void)setImageColor:(UIColor *)imageColor { - (UIImage*)makeImage:(UIImage *)image withTint:(UIColor *)color { UIImage *newImage = [image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; - UIGraphicsBeginImageContextWithOptions(image.size, NO, 0.0); + UIGraphicsBeginImageContextWithOptions(image.size, NO, newImage.scale); [color set]; - [newImage drawInRect:CGRectMake(0, 0, newImage.size.width, newImage.size.height)]; + [newImage drawInRect:CGRectMake(0, 0, image.size.width, newImage.size.height)]; newImage = UIGraphicsGetImageFromCurrentImageContext(); UIGraphicsEndImageContext(); return newImage; @@ -124,7 +124,7 @@ - (void)reloadImage } { self.hasSentOnLoadStart = NO; } - UIImage *image = [UIImage imageWithData:[NSData dataWithContentsOfURL:_source.url] scale:[[UIScreen mainScreen] scale]]; + UIImage *image = [UIImage imageWithData:[NSData dataWithContentsOfURL:_source.url]]; [self setImage:image]; if (self.onFastImageProgress) { self.onFastImageProgress(@{ @@ -209,13 +209,6 @@ - (void)downloadImage:(FFFastImageSource *) source options:(SDWebImageOptions) o weakSelf.onFastImageLoadEnd(@{}); } } else { - CGFloat scale = [UIScreen mainScreen].scale; - - if (scale > 1.0) { - image = [UIImage imageWithCGImage:[image CGImage] scale: scale orientation:UIImageOrientationUp]; - [weakSelf setImage:image]; - } - weakSelf.hasCompleted = YES; [weakSelf sendOnLoad:image]; if (weakSelf.onFastImageLoadEnd) {