Skip to content

Commit

Permalink
Fix iOS 8 warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jared Sinclair committed Aug 31, 2014
1 parent cfd711d commit 060ee00
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../Source/JTSImageViewController.m"
timestampString = "431165635.741594"
timestampString = "431165868.165834"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "534"
endingLineNumber = "534"
startingLineNumber = "533"
endingLineNumber = "533"
landmarkName = "-showImageViewerByExpandingFromOriginalPositionFromViewController:"
landmarkType = "5">
</BreakpointContent>
Expand All @@ -26,11 +26,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../Source/JTSImageViewController.m"
timestampString = "431165635.741594"
timestampString = "431165868.165834"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1195"
endingLineNumber = "1195"
startingLineNumber = "1194"
endingLineNumber = "1194"
landmarkName = "-updateLayoutsForCurrentOrientation"
landmarkType = "5">
</BreakpointContent>
Expand All @@ -42,11 +42,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../Source/JTSImageViewController.m"
timestampString = "431165635.741594"
timestampString = "431165868.165834"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1198"
endingLineNumber = "1198"
startingLineNumber = "1197"
endingLineNumber = "1197"
landmarkName = "-updateLayoutsForCurrentOrientation"
landmarkType = "5">
</BreakpointContent>
Expand All @@ -58,11 +58,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../Source/JTSImageViewController.m"
timestampString = "431165635.741594"
timestampString = "431165868.165834"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1201"
endingLineNumber = "1201"
startingLineNumber = "1200"
endingLineNumber = "1200"
landmarkName = "-updateLayoutsForCurrentOrientation"
landmarkType = "5">
</BreakpointContent>
Expand All @@ -74,11 +74,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../../Source/JTSImageViewController.m"
timestampString = "431165635.741594"
timestampString = "431165868.165834"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1204"
endingLineNumber = "1204"
startingLineNumber = "1203"
endingLineNumber = "1203"
landmarkName = "-updateLayoutsForCurrentOrientation"
landmarkType = "5">
</BreakpointContent>
Expand Down
3 changes: 1 addition & 2 deletions Source/JTSImageViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,6 @@ - (void)showImageViewerByExpandingFromOriginalPositionFromViewController:(UIView

self.lastUsedOrientation = [UIApplication sharedApplication].statusBarOrientation;
CGRect referenceFrameInWindow = [self.imageInfo.referenceView convertRect:self.imageInfo.referenceRect toView:nil];
CGPoint referencePointInWindow = [self.imageInfo.referenceView convertPoint:self.imageInfo.referenceRectCenter toView:nil];

_startingInfo.startingReferenceFrameForThumbnailInPresentingViewControllersOriginalOrientation = [self.view convertRect:referenceFrameInWindow fromView:nil];

Expand All @@ -537,7 +536,7 @@ - (void)showImageViewerByExpandingFromOriginalPositionFromViewController:(UIView
[self.imageView setFrame:referenceFrameInMyView];
[self updateScrollViewAndImageViewForCurrentMetrics];

BOOL mustRotateDuringTransition = (self.interfaceOrientation != _startingInfo.startingInterfaceOrientation);
BOOL mustRotateDuringTransition = ([UIApplication sharedApplication].statusBarOrientation != _startingInfo.startingInterfaceOrientation);
if (mustRotateDuringTransition) {
CGRect newStartingRect = [self.snapshotView convertRect:_startingInfo.startingReferenceFrameForThumbnail toView:self.view];
[self.imageView setFrame:newStartingRect];
Expand Down

0 comments on commit 060ee00

Please sign in to comment.