ios / yh_sdwebimage · Commits

Go to a project

Authored by Bogdan Poplauschi
Commit 7e160e34a2cfc3548705634914ed073320272f0c 2 parents 466e4011 8f309e19

Merge pull request #1158 from akmarinov/master 

Fixed an issue that causes URLs with trailing parameters to be assign…
Inline Side-by-side
Showing 1 changed file with 2 additions and 3 deletions
@@ -30,13 +30,12 @@ inline UIImage *SDScaledImageForKey(NSString *key, UIImage *image) { @@ -30,13 +30,12 @@ inline UIImage *SDScaledImageForKey(NSString *key, UIImage *image) {
30 if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)]) { 30 if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)]) {
31 CGFloat scale = 1.0; 31 CGFloat scale = 1.0;
32 if (key.length >= 8) { 32 if (key.length >= 8) {
33 - // Search @2x. or @3x. at the end of the string, before a 3 to 4 extension length (only if key len is 8 or more @2x./@3x. + 4 len ext)  
34 - NSRange range = [key rangeOfString:@"@2x." options:0 range:NSMakeRange(key.length - 8, 5)]; 33 + NSRange range = [key rangeOfString:@"@2x."];
35 if (range.location != NSNotFound) { 34 if (range.location != NSNotFound) {
36 scale = 2.0; 35 scale = 2.0;
37 } 36 }
38 37
39 - range = [key rangeOfString:@"@3x." options:0 range:NSMakeRange(key.length - 8, 5)]; 38 + range = [key rangeOfString:@"@3x."];
40 if (range.location != NSNotFound) { 39 if (range.location != NSNotFound) {
41 scale = 3.0; 40 scale = 3.0;
42 } 41 }