@@ -22,27 +22,27 @@ + (UIColor *)mdc_colorInterpolatedFromColor:(UIColor *)fromColor
22
22
toColor : (UIColor *)toColor
23
23
percent : (CGFloat)percent {
24
24
// Clamp percent to [0.0, 1.0]
25
- percent = MAX (0.0 , percent);
26
- percent = MIN (1.0 , percent);
25
+ percent = MAX (0 , percent);
26
+ percent = MIN (1 , percent);
27
27
28
28
CGFloat r1, g1, b1, a1;
29
- r1 = g1 = b1 = a1 = 1.0 ;
29
+ r1 = g1 = b1 = a1 = 1 ;
30
30
if (![fromColor getRed: &r1 green: &g1 blue: &b1 alpha: &a1]) {
31
31
[fromColor getWhite: &r1 alpha: &a1];
32
32
g1 = b1 = r1;
33
33
};
34
34
35
35
CGFloat r2, g2, b2, a2;
36
- r2 = g2 = b2 = a2 = 1.0 ;
36
+ r2 = g2 = b2 = a2 = 1 ;
37
37
if (![toColor getRed: &r2 green: &g2 blue: &b2 alpha: &a2]) {
38
38
[toColor getWhite: &r2 alpha: &a2];
39
39
g2 = b2 = r2;
40
40
}
41
41
42
- CGFloat rfinal = r1 * (1.0 - percent) + r2 * percent;
43
- CGFloat gfinal = g1 * (1.0 - percent) + g2 * percent;
44
- CGFloat bfinal = b1 * (1.0 - percent) + b2 * percent;
45
- CGFloat afinal = a1 * (1.0 - percent) + a2 * percent;
42
+ CGFloat rfinal = r1 * (1 - percent) + r2 * percent;
43
+ CGFloat gfinal = g1 * (1 - percent) + g2 * percent;
44
+ CGFloat bfinal = b1 * (1 - percent) + b2 * percent;
45
+ CGFloat afinal = a1 * (1 - percent) + a2 * percent;
46
46
47
47
return [UIColor colorWithRed: rfinal green: gfinal blue: bfinal alpha: afinal];
48
48
}
0 commit comments