Merge pull request #41 from bruvzg/4_0_api

Update Camera and Photo Picker plugins to use new 4.0 API.

Author: akien-mga

plugins/camera/camera_ios.mm

@@ -183,12 +183,13 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
 			uint8_t *w = img_data[0].ptrw();
 			memcpy(w, dataY, new_width * new_height);
 			img[0].instantiate();
+			img[0]->set_data(new_width, new_height, 0, Image::FORMAT_R8, img_data[0]);
 #else
 			GodotUInt8Vector::Write w = img_data[0].write();
 			memcpy(w.ptr(), dataY, new_width * new_height);
 			img[0].instance();
-#endif
 			img[0]->create(new_width, new_height, 0, Image::FORMAT_R8, img_data[0]);
+#endif
 		}
 
 		{
@@ -202,18 +203,18 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
 				img_data[1].resize(2 * new_width * new_height);
 			}
 
+			///TODO GLES2 doesn't support FORMAT_RG8, need to do some form of conversion
 #if VERSION_MAJOR == 4
 			uint8_t *w = img_data[1].ptrw();
 			memcpy(w, dataCbCr, 2 * new_width * new_height);
 			img[1].instantiate();
+			img[1]->set_data(new_width, new_height, 0, Image::FORMAT_RG8, img_data[1]);
 #else
 			GodotUInt8Vector::Write w = img_data[1].write();
 			memcpy(w.ptr(), dataCbCr, 2 * new_width * new_height);
 			img[1].instance();
-#endif
-
-			///TODO GLES2 doesn't support FORMAT_RG8, need to do some form of conversion
 			img[1]->create(new_width, new_height, 0, Image::FORMAT_RG8, img_data[1]);
+#endif
 		}
 
 		// set our texture...

plugins/photo_picker/photo_picker.mm

@@ -195,15 +195,16 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking
 				memcpy(w, data, length);
 
 				img.instantiate();
+				img->set_data(image.size.width * image.scale, image.size.height * image.scale, 0, Image::FORMAT_RGBA8, img_data);
 #else
 				PoolVector<uint8_t> img_data;
 				img_data.resize(length);
 				PoolVector<uint8_t>::Write w = img_data.write();
 				memcpy(w.ptr(), data, length);
 
 				img.instance();
-#endif
 				img->create(image.size.width * image.scale, image.size.height * image.scale, 0, Image::FORMAT_RGBA8, img_data);
+#endif
 
 				PhotoPicker::get_singleton()->select_image(img);
 			}