Update CameraLauncher.java

Includes the pull request apache#331 (apacheGH-329) from the main fork
Includes the pull request apache#238 from the main fork

Author: Tilexou

src/android/CameraLauncher.java

@@ -994,6 +994,7 @@ private Bitmap getScaledAndRotatedBitmap(String imageUrl) throws IOException {
                         // read exifData of source
                         exifData = new ExifHelper();
                         exifData.createInFile(filePath);
+                        exifData.readExifData();
                         // Use ExifInterface to pull rotation information
                         if (this.correctOrientation) {
                             ExifInterface exif = new ExifInterface(filePath);
@@ -1117,8 +1118,8 @@ private Bitmap getScaledAndRotatedBitmap(String imageUrl) throws IOException {
      * @return
      */
     public int[] calculateAspectRatio(int origWidth, int origHeight) {
-        int newWidth = this.targetWidth;
-        int newHeight = this.targetHeight;
+        int newWidth = Math.min(this.targetWidth, origWidth);
+        int newHeight = Math.min(this.targetHeight, origHeight);
 
         // If no new width or height were specified return the original bitmap
         if (newWidth <= 0 && newHeight <= 0) {