From e2047afa426066b2764cfb3b1b0fa809abdc6f55 Mon Sep 17 00:00:00 2001 From: macdonst Date: Wed, 27 Jun 2012 15:32:26 -0400 Subject: [PATCH] Wire rotation fix to correctOrientation parameter --- framework/src/org/apache/cordova/CameraLauncher.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/framework/src/org/apache/cordova/CameraLauncher.java b/framework/src/org/apache/cordova/CameraLauncher.java index 4d21a9b5..8b0c7b4d 100755 --- a/framework/src/org/apache/cordova/CameraLauncher.java +++ b/framework/src/org/apache/cordova/CameraLauncher.java @@ -83,6 +83,7 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie private int encodingType; // Type of encoding to use private int mediaType; // What type of media to retrieve private boolean saveToPhotoAlbum; // Should the picture be saved to the device's photo album + private boolean correctOrientation; // Should the pictures orientation be corrected public String callbackId; private int numPics; @@ -137,6 +138,7 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie this.targetHeight = args.getInt(4); this.encodingType = args.getInt(5); this.mediaType = args.getInt(6); + this.correctOrientation = args.getBoolean(8); this.saveToPhotoAlbum = args.getBoolean(9); if (srcType == CAMERA) { @@ -281,7 +283,7 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie if (destType == DATA_URL) { bitmap = getScaledBitmap(FileUtils.stripFileProtocol(imageUri.toString())); - if (rotate != 0) { + if (rotate != 0 && this.correctOrientation) { bitmap = getRotatedBitmap(rotate, bitmap, exif); } @@ -310,7 +312,7 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie } else { bitmap = getScaledBitmap(FileUtils.stripFileProtocol(imageUri.toString())); - if (rotate != 0) { + if (rotate != 0 && this.correctOrientation) { bitmap = getRotatedBitmap(rotate, bitmap, exif); }