Merge pull request #87 from Timac/master

Fix warnings and remove bad file
erichoracek · Feb 22, 2014 · f0e1368 · f0e1368
2 parents 0a49a26 + 36cdc10
commit f0e1368
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1,324 deletions.
diff --git a/MSDynamicsDrawerViewController/MSDynamicsDrawerStyler.m b/MSDynamicsDrawerViewController/MSDynamicsDrawerStyler.m
@@ -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;
 }

diff --git a/MSDynamicsDrawerViewController/MSDynamicsDrawerViewController.m b/MSDynamicsDrawerViewController/MSDynamicsDrawerViewController.m
@@ -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;
     }