Merge pull request #65 from ajsecord/fix-conversion-error-64

ajsecord · ajsecord · commit b15d169f930c · 2016-01-26T10:30:47.000-08:00
Fixes #64.
diff --git a/components/Ink/src/private/MDCInkLayer.m b/components/Ink/src/private/MDCInkLayer.m
@@ -31,7 +31,7 @@ static inline CGPoint MDCInkLayerRectGetCenter(CGRect rect) {
 }
 
 static inline CGFloat MDCInkLayerRectHypotenuse(CGRect rect) {
-  return hypot(CGRectGetWidth(rect), CGRectGetHeight(rect));
+  return (CGFloat)hypot(CGRectGetWidth(rect), CGRectGetHeight(rect));
 }
 
 static CGFloat const kMDCInkLayerBackgroundOpacityEnterDuration = 0.6f;

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ static inline CGPoint MDCInkLayerRectGetCenter(CGRect rect) {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`static inline CGFloat MDCInkLayerRectHypotenuse(CGRect rect) {`
`34`		`- return hypot(CGRectGetWidth(rect), CGRectGetHeight(rect));`
	`34`	`+ return (CGFloat)hypot(CGRectGetWidth(rect), CGRectGetHeight(rect));`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`static CGFloat const kMDCInkLayerBackgroundOpacityEnterDuration = 0.6f;`