fix: Loading images by reverting "bug: Use device scale when loading …

…images.". fix #509 This reverts commit 5cb5d6b.
DylanVann · Jul 3, 2019 · 0326c3e · 0326c3e
1 parent ba958f2
commit 0326c3e
Showing 1 changed file with 3 additions and 10 deletions.
diff --git 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) {