Skip to content

Commit

Permalink
Merge pull request #23 from kgn/master
Browse files Browse the repository at this point in the history
Fixing deprecation warnings
  • Loading branch information
dmitric committed Nov 14, 2012
2 parents 1338ae9 + fde2523 commit 7ec9cc1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Classes/DLCImagePickerController.m
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

0 comments on commit 7ec9cc1

Please sign in to comment.