diff options
| author |  gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2013-06-26 13:30:10 +0000 |
|---|---|---|
| committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2013-06-26 13:30:10 +0000 |
| commit | 2f45a5bc6397429ff536cac2ffb815dc15bc02a5 (patch) | |
| tree | d713f288395ba45cbe2e9fab7724a545ba9f9bed /iPhone | |
| parent | 6017afdfd4d0b3d3070980b8a540acbc1c5e242a (diff) | |
Turn on three warnings that were on in Pulse but not on for local development. Resolve a large collection of warnings generated by turning on SUSPICIOUS_IMPLICIT_CONVERSIONS which included the three warnings but also apparently extras.
QA:
No change should be observed.
TESTED=tests still pass
DELTA=155 (48 added, 61 deleted, 46 changed)
Diffstat (limited to 'iPhone')
| -rw-r--r-- | iPhone/GTMRoundedRectPath.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/iPhone/GTMRoundedRectPath.m b/iPhone/GTMRoundedRectPath.m index 823c9f9..2ac68b2 100644 --- a/iPhone/GTMRoundedRectPath.m +++ b/iPhone/GTMRoundedRectPath.m @@ -25,8 +25,8 @@ void GTMCGContextAddRoundRect(CGContextRef context, if (!CGRectIsEmpty(rect)) { if (radius > 0.0) { // Clamp radius to be no larger than half the rect's width or height. - radius = MIN(radius, 0.5 * MIN(rect.size.width, rect.size.height)); - + radius = MIN(radius, 0.5f * MIN(rect.size.width, rect.size.height)); + CGPoint topLeft = CGPointMake(CGRectGetMinX(rect), CGRectGetMaxY(rect)); CGPoint topRight = CGPointMake(CGRectGetMaxX(rect), CGRectGetMaxY(rect)); CGPoint bottomRight = CGPointMake(CGRectGetMaxX(rect), @@ -55,8 +55,8 @@ void GTMCGPathAddRoundRect(CGMutablePathRef path, if (!CGRectIsEmpty(rect)) { if (radius > 0.0) { // Clamp radius to be no larger than half the rect's width or height. - radius = MIN(radius, 0.5 * MIN(rect.size.width, rect.size.height)); - + radius = MIN(radius, 0.5f * MIN(rect.size.width, rect.size.height)); + CGPoint topLeft = CGPointMake(CGRectGetMinX(rect), CGRectGetMaxY(rect)); CGPoint topRight = CGPointMake(CGRectGetMaxX(rect), CGRectGetMaxY(rect)); CGPoint bottomRight = CGPointMake(CGRectGetMaxX(rect), |