From 2f45a5bc6397429ff536cac2ffb815dc15bc02a5 Mon Sep 17 00:00:00 2001 From: "gtm.daemon" Date: Wed, 26 Jun 2013 13:30:10 +0000 Subject: 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) --- iPhone/GTMRoundedRectPath.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'iPhone') 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), -- cgit v1.2.3