Merge pull request samvermette#86 from jessedc/master

Fixes for several compiler warnings
harleywang · Jan 15, 2013 · b685d57 · b685d57
2 parents fb45717 + 67cda76
commit b685d57
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/SVPullToRefresh/UIScrollView+SVInfiniteScrolling.h b/SVPullToRefresh/UIScrollView+SVInfiniteScrolling.h
@@ -42,4 +42,4 @@ typedef NSUInteger SVInfiniteScrollingState;
 - (void)startAnimating;
 - (void)stopAnimating;
 
-@end
+@end
diff --git a/SVPullToRefresh/UIScrollView+SVInfiniteScrolling.m b/SVPullToRefresh/UIScrollView+SVInfiniteScrolling.m
@@ -274,12 +274,12 @@ - (void)setState:(SVInfiniteScrollingState)newState {
  if(hasCustomView) {
  [self addSubview:customView];
  CGRect viewBounds = [customView bounds];
- CGPoint origin = CGPointMake(round((self.bounds.size.width-viewBounds.size.width)/2), round((self.bounds.size.height-viewBounds.size.height)/2));
+ CGPoint origin = CGPointMake(roundf((self.bounds.size.width-viewBounds.size.width)/2), roundf((self.bounds.size.height-viewBounds.size.height)/2));
  [customView setFrame:CGRectMake(origin.x, origin.y, viewBounds.size.width, viewBounds.size.height)];
  }
  else {
  CGRect viewBounds = [self.activityIndicatorView bounds];
- CGPoint origin = CGPointMake(round((self.bounds.size.width-viewBounds.size.width)/2), round((self.bounds.size.height-viewBounds.size.height)/2));
+ CGPoint origin = CGPointMake(roundf((self.bounds.size.width-viewBounds.size.width)/2), roundf((self.bounds.size.height-viewBounds.size.height)/2));
  [self.activityIndicatorView setFrame:CGRectMake(origin.x, origin.y, viewBounds.size.width, viewBounds.size.height)];
 
  switch (newState) {
@@ -300,4 +300,4 @@ - (void)setState:(SVInfiniteScrollingState)newState {
  self.infiniteScrollingHandler();
 }
 
-@end
+@end
diff --git a/SVPullToRefresh/UIScrollView+SVPullToRefresh.h b/SVPullToRefresh/UIScrollView+SVPullToRefresh.h
@@ -58,4 +58,4 @@ typedef NSUInteger SVPullToRefreshState;
 // deprecated; use [self.scrollView triggerPullToRefresh] instead
 - (void)triggerRefresh DEPRECATED_ATTRIBUTE;
 
-@end
+@end
diff --git a/SVPullToRefresh/UIScrollView+SVPullToRefresh.m b/SVPullToRefresh/UIScrollView+SVPullToRefresh.m
@@ -10,6 +10,8 @@
 #import <QuartzCore/QuartzCore.h>
 #import "UIScrollView+SVPullToRefresh.h"
 
+//fequalzro() from http:https://stackoverflow.com/a/1614761/184130
+#define fequalzero(a) (fabs(a) < FLT_EPSILON)
 
 static CGFloat const SVPullToRefreshViewHeight = 60;
 
@@ -175,15 +177,15 @@ - (void)layoutSubviews {
  float position = 0.50;
 
  CGRect titleFrame = self.titleLabel.frame;
- titleFrame.origin.x = ceil(remainingWidth*position+44);
+ titleFrame.origin.x = ceilf(remainingWidth*position+44);
  self.titleLabel.frame = titleFrame;
 
  CGRect dateFrame = self.subtitleLabel.frame;
  dateFrame.origin.x = titleFrame.origin.x;
  self.subtitleLabel.frame = dateFrame;
 
  CGRect arrowFrame = self.arrow.frame;
- arrowFrame.origin.x = ceil(remainingWidth*position);
+ arrowFrame.origin.x = ceilf(remainingWidth*position);
  self.arrow.frame = arrowFrame;
 
  self.activityIndicatorView.center = self.arrow.center;
@@ -203,7 +205,7 @@ - (void)layoutSubviews {
  if(hasCustomView) {
  [self addSubview:customView];
  CGRect viewBounds = [customView bounds];
- CGPoint origin = CGPointMake(round((self.bounds.size.width-viewBounds.size.width)/2), round((self.bounds.size.height-viewBounds.size.height)/2));
+ CGPoint origin = CGPointMake(roundf((self.bounds.size.width-viewBounds.size.width)/2), roundf((self.bounds.size.height-viewBounds.size.height)/2));
  [customView setFrame:CGRectMake(origin.x, origin.y, viewBounds.size.width, viewBounds.size.height)];
  }
  else {
@@ -221,7 +223,7 @@ - (void)layoutSubviews {
  break;
 
  case SVPullToRefreshStateTriggered:
- [self rotateArrow:M_PI hide:NO];
+ [self rotateArrow:(float)M_PI hide:NO];
  break;
 
  case SVPullToRefreshStateLoading:
@@ -429,7 +431,7 @@ - (void)triggerRefresh {
 }
 
 - (void)startAnimating{
- if(self.scrollView.contentOffset.y == 0) {
+ if(fequalzero(self.scrollView.contentOffset.y)) {
  [self.scrollView setContentOffset:CGPointMake(self.scrollView.contentOffset.x, -self.frame.size.height) animated:YES];
  self.wasTriggeredByUser = NO;
  }
@@ -518,7 +520,7 @@ - (void)drawRect:(CGRect)rect {
 
  // Gradient Declaration
  CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
- CGFloat alphaGradientLocations[] = {0, 0.8};
+ CGFloat alphaGradientLocations[] = {0, 0.8f};
 
  CGGradientRef alphaGradient = nil;
  if([[[UIDevice currentDevice] systemVersion]floatValue] >= 5){
@@ -529,7 +531,7 @@ - (void)drawRect:(CGRect)rect {
  alphaGradient = CGGradientCreateWithColors(colorSpace, (__bridge CFArrayRef)alphaGradientColors, alphaGradientLocations);
  }else{
  const CGFloat * components = CGColorGetComponents([self.arrowColor CGColor]);
- int numComponents = CGColorGetNumberOfComponents([self.arrowColor CGColor]); 
+ int numComponents = (int)CGColorGetNumberOfComponents([self.arrowColor CGColor]);
  CGFloat colors[8];
  switch(numComponents){
  case 2:{