Permalink
Browse files

Merge pull request #87 from Timac/master

Fix warnings and remove bad file
  • Loading branch information...
2 parents 0a49a26 + 36cdc10 commit f0e13688273c735abcf8867b92e4a5ca00b838b5 @erichoracek committed Feb 22, 2014
@@ -61,9 +61,9 @@ - (void)dynamicsDrawerViewController:(MSDynamicsDrawerViewController *)dynamicsD
} else if (direction & MSDynamicsDrawerDirectionVertical) {
drawerViewTransform.ty = CGAffineTransformMakeTranslation(0.0, translate).ty;
} else {
- CGAffineTransform translate = CGAffineTransformMakeTranslation(0.0, 0.0);
- drawerViewTransform.tx = translate.tx;
- drawerViewTransform.ty = translate.ty;
+ CGAffineTransform translateTransform = CGAffineTransformMakeTranslation(0.0, 0.0);
+ drawerViewTransform.tx = translateTransform.tx;
+ drawerViewTransform.ty = translateTransform.ty;
}
dynamicsDrawerViewController.drawerView.transform = drawerViewTransform;
}
@@ -375,7 +375,7 @@ - (void)setDrawerViewController:(UIViewController *)drawerViewController
- (void)setDrawerViewController:(UIViewController *)drawerViewController forDirection:(MSDynamicsDrawerDirection)direction
{
NSAssert(MSDynamicsDrawerDirectionIsCardinal(direction), @"Only accepts cardinal reveal directions");
- for (UIViewController *currentDrawerViewController in self.drawerViewControllers) {
+ for (UIViewController * __unused currentDrawerViewController in self.drawerViewControllers) {
NSAssert(currentDrawerViewController != drawerViewController, @"Unable to add a drawer view controller when it's previously been added");
}
if (direction & MSDynamicsDrawerDirectionHorizontal) {
@@ -1080,12 +1080,12 @@ - (CGRect)paneViewFrameForPanWithStartLocation:(CGPoint)startLocation currentLoc
break;
}
// Bounded open
- if (*paneLocation <= paneBoundClosedLocation) {
+ if (paneLocation && (*paneLocation <= paneBoundClosedLocation)) {
*paneLocation = paneBoundClosedLocation;
*bounded = YES;
}
// Bounded closed
- else if (*paneLocation >= paneBoundOpenLocation) {
+ else if (paneLocation && (*paneLocation >= paneBoundOpenLocation)) {
*paneLocation = paneBoundOpenLocation;
*bounded = YES;
}
Oops, something went wrong.

0 comments on commit f0e1368

Please sign in to comment.