Write EXIF metadata to camera images

* When taking a picture from the camera, grab the exif data and write that into the image
* For FIC thumbnails make sure the orientation is passed to the thum so that it is oriented correctly.

fixes #44

Author: newmanw

MAGE.xcodeproj/project.pbxproj

@@ -1021,7 +1021,7 @@
 				ORGANIZATIONNAME = "National Geospatial Intelligence Agency";
 				TargetAttributes = {
 					F7A94D6518AD9CB000CB9EE0 = {
-						DevelopmentTeam = ZL8G5D9G2H;
+						DevelopmentTeam = A8EK924J35;
 					};
 				};
 			};
@@ -1382,7 +1382,7 @@
 				INFOPLIST_FILE = "Mage/MAGE-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_LDFLAGS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = mil.nga.mage;
+				PRODUCT_BUNDLE_IDENTIFIER = mil.nga.giat.MAGE;
 				PRODUCT_NAME = MAGE;
 				PROVISIONING_PROFILE = "";
 				WRAPPER_EXTENSION = app;
@@ -1404,7 +1404,7 @@
 				INFOPLIST_FILE = "Mage/MAGE-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_LDFLAGS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = mil.nga.mage;
+				PRODUCT_BUNDLE_IDENTIFIER = mil.nga.giat.MAGE;
 				PRODUCT_NAME = MAGE;
 				PROVISIONING_PROFILE = "";
 				WRAPPER_EXTENSION = app;

Mage/Attachment+FICAttachment.m

@@ -63,8 +63,9 @@ - (FICEntityImageDrawingBlock)drawingBlockForImage:(UIImage *)image withFormatNa
         }
 
         CGImageRef imageRef = CGImageCreateWithImageInRect([image CGImage], cropRect);
-        imageToUse = [UIImage imageWithCGImage:imageRef];
-        CGImageRelease(imageRef);            
+        imageToUse = [UIImage imageWithCGImage:imageRef scale:image.scale orientation:[image imageOrientation]];
+
+        CGImageRelease(imageRef);
 
         [imageToUse drawInRect:contextBounds];
         UIGraphicsPopContext();

Mage/MAGE-Info.plist

@@ -36,7 +36,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>20160521</string>
+	<string>20160522</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>

Mage/ObservationEditViewController.m

@@ -20,6 +20,7 @@
 #import "AttachmentSelectionDelegate.h"
 #import <Server+helper.h>
 #import <Event+helper.h>
+#import <ImageIO/ImageIO.h>
 #import "ObservationEditTextFieldTableViewCell.h"
 
 @interface ObservationEditViewController () <UIImagePickerControllerDelegate, UINavigationControllerDelegate, AudioRecordingDelegate, AttachmentSelectionDelegate>
@@ -193,6 +194,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking
         }
     } else {
         UIImage *chosenImage = info[UIImagePickerControllerOriginalImage];
+        NSMutableDictionary *imageMetadata = [[info objectForKey:UIImagePickerControllerMediaMetadata] mutableCopy];
 
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyymmdd_HHmmss"];
@@ -213,12 +215,34 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking
                 NSLog(@"Error creating directory path: %@", [error localizedDescription]);
         }
 
-        NSData *imageData = UIImagePNGRepresentation(chosenImage);
-        BOOL success = [imageData writeToFile:fileToWriteTo atomically:NO];
+        NSData *imageData = UIImageJPEGRepresentation(chosenImage, 1.0f);
+        CGImageSourceRef source = CGImageSourceCreateWithData((__bridge CFDataRef) imageData, NULL);
+        CFStringRef UTI = CGImageSourceGetType(source);
+        NSMutableData *destinationData = [NSMutableData data];
+        CGImageDestinationRef destination = CGImageDestinationCreateWithData((__bridge CFMutableDataRef) destinationData, UTI, 1, NULL);
+        
+        if (!destinationData) {
+            NSLog(@"Error: Could not create image destination");
+        }
+        
+        // add the image contained in the image source to the destination, overidding the old metadata with our modified metadata
+        CGImageDestinationAddImageFromSource(destination, source, 0, (__bridge CFDictionaryRef) imageMetadata);
+        BOOL success = NO;
+        success = CGImageDestinationFinalize(destination);
+        
+        success = [destinationData writeToFile:fileToWriteTo atomically:NO];
+        
+        if (!success) {
+            NSLog(@"Error: Could not create data from image destination");
+        }
+        
+        CFRelease(destination);
+        CFRelease(source);
+        
         NSLog(@"successfully wrote file %d", success);
 
         NSMutableDictionary *attachmentJson = [NSMutableDictionary dictionary];
-        [attachmentJson setValue:@"image/png" forKey:@"contentType"];
+        [attachmentJson setValue:@"image/jpeg" forKey:@"contentType"];
         [attachmentJson setValue:fileToWriteTo forKey:@"localPath"];
         [attachmentJson setValue:[NSString stringWithFormat: @"MAGE_%@.png", [dateFormatter stringFromDate: [NSDate date]]] forKey:@"name"];
         [attachmentJson setValue:[NSNumber numberWithBool:YES] forKey:@"dirty"];