Merge pull request guillermomuntaner#70 from bithug/master

Allow editing captured images

Author: guillermomuntaner

GMImagePicker/GMImagePickerController.h

@@ -121,6 +121,11 @@ static CGSize const kPopoverContentSize = {480, 720};
  */
 @property (nonatomic, assign) BOOL autoSelectCameraImages;
 
+/**
+ * If set, the user is allowed to edit captured still images
+ */
+@property (nonatomic, assign) BOOL allowsEditingCameraImages;
+
 /**
  *  Grid customizations:
  *

GMImagePicker/GMImagePickerController.m

@@ -286,7 +286,7 @@ - (void)cameraButtonPressed:(UIBarButtonItem *)button
     UIImagePickerController *picker = [[UIImagePickerController alloc] init];
     picker.sourceType = UIImagePickerControllerSourceTypeCamera;
     picker.mediaTypes = @[(NSString *)kUTTypeImage];
-    picker.allowsEditing = NO;
+    picker.allowsEditing = self.allowsEditingCameraImages;
     picker.delegate = self;
     picker.modalPresentationStyle = UIModalPresentationPopover;
 
@@ -353,7 +353,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking
 
     NSString *mediaType = info[UIImagePickerControllerMediaType];
     if ([mediaType isEqualToString:(NSString *)kUTTypeImage]) {
-        UIImage *image = info[UIImagePickerControllerOriginalImage];
+        UIImage *image = info[UIImagePickerControllerEditedImage] ? : info[UIImagePickerControllerOriginalImage];
         UIImageWriteToSavedPhotosAlbum(image,
                                        self,
                                        @selector(image:finishedSavingWithError:contextInfo:),