Respond to CR.

// FREEBIE
pull/1/head
Matthew Chen 9 years ago
parent 1b99fd1df4
commit a7cf00feb4

@ -133,18 +133,19 @@
BOOL result = BOOL result =
#endif #endif
[self getRed:&r0 green:&g0 blue:&b0 alpha:&a0]; [self getRed:&r0 green:&g0 blue:&b0 alpha:&a0];
OWSAssert(result) OWSAssert(result);
CGFloat r1, CGFloat r1, g1, b1, a1;
g1, b1, a1;
#ifdef DEBUG #ifdef DEBUG
result = result =
#endif #endif
[otherColor getRed:&r1 green:&g1 blue:&b1 alpha:&a1]; [otherColor getRed:&r1 green:&g1 blue:&b1 alpha:&a1];
OWSAssert(result) return [UIColor colorWithRed:CGFloatLerp(r0, r1, alpha) OWSAssert(result);
green:CGFloatLerp(g0, g1, alpha)
blue:CGFloatLerp(b0, b1, alpha) return [UIColor colorWithRed:CGFloatLerp(r0, r1, alpha)
alpha:CGFloatLerp(a0, a1, alpha)]; green:CGFloatLerp(g0, g1, alpha)
blue:CGFloatLerp(b0, b1, alpha)
alpha:CGFloatLerp(a0, a1, alpha)];
} }
@end @end

Loading…
Cancel
Save