Procházet zdrojové kódy

Merge master into fix_tint_image_bug

zhongwuzw před 7 roky
rodič
revize
522743f246

+ 1 - 1
SDWebImage/UIImage+Transform.m

@@ -228,7 +228,7 @@ static inline UIColor * SDGetColorFromPixel(Pixel_8888 pixel, CGBitmapInfo bitma
         
         CGContextSaveGState(context);
         [path addClip];
-        CGContextDrawImage(context, rect, self.CGImage);
+        [self drawInRect:rect];
         CGContextRestoreGState(context);
     }
     

binární
Tests/Tests/Images/TestImage.png


+ 3 - 0
Tests/Tests/SDImageTransformerTests.m

@@ -67,6 +67,9 @@
     // Check the left center pixel, should be border :)
     UIColor *checkBorderColor = [roundedCornerImage sd_colorAtPoint:CGPointMake(1, 150)];
     expect([checkBorderColor.sd_hexString isEqualToString:borderColor.sd_hexString]).beTruthy();
+    // Check rounded corner operation not inversion the image
+    UIColor *topCenterColor = [roundedCornerImage sd_colorAtPoint:CGPointMake(150, 20)];
+    expect([topCenterColor.sd_hexString isEqualToString:[UIColor blackColor].sd_hexString]).beTruthy();
 }
 
 - (void)test04UIImageTransformRotate {