Skip to content

Fixing deprecation warnings #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmitric merged 2 commits into from
Nov 14, 2012
Merged

Fixing deprecation warnings #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b52fa4d
fixing deprecation warnings
kgn Nov 12, 2012
fde2523
Merge branch 'master' of https://github.com/kgn/DLCImagePickerController
kgn Nov 12, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Classes/DLCImagePickerController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking
staticPicture = [[GPUImagePicture alloc] initWithImage:outputImage smoothlyScaleOutput:YES];
staticPictureOriginalOrientation = outputImage.imageOrientation;
isStatic = YES;
[self dismissModalViewControllerAnimated:YES];
[self dismissViewControllerAnimated:YES completion:nil];
[self.cameraToggleButton setEnabled:NO];
[self.flashToggleButton setEnabled:NO];
[self prepareStaticFilter];
Expand All @@ -627,10 +627,10 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking
- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
if (isStatic) {
// TODO: fix this hack
[self dismissModalViewControllerAnimated:NO];
[self dismissViewControllerAnimated:NO completion:nil];
[self.delegate imagePickerControllerDidCancel:self];
} else {
[self dismissModalViewControllerAnimated:YES];
[self dismissViewControllerAnimated:YES completion:nil];
[self retakePhoto:nil];
}
}
Expand Down