mirror of
https://github.com/apache/cordova-plugin-camera.git
synced 2025-02-07 18:12:50 +08:00
CB-9259: Forgot to add another check on which URI we're using when fixing this thing the first time
This commit is contained in:
parent
1e607ddcc8
commit
899802a202
@ -379,7 +379,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
|
|||||||
}
|
}
|
||||||
|
|
||||||
//We don't support PNG, so let's not pretend we do
|
//We don't support PNG, so let's not pretend we do
|
||||||
exif.createInFile(getTempDirectoryPath() + "/.Pic.jpg");
|
exif.createInFile(sourcePath);
|
||||||
exif.readExifData();
|
exif.readExifData();
|
||||||
rotate = exif.getOrientation();
|
rotate = exif.getOrientation();
|
||||||
|
|
||||||
@ -442,7 +442,13 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
|
|||||||
|
|
||||||
this.callbackContext.success(uri.toString());
|
this.callbackContext.success(uri.toString());
|
||||||
} else {
|
} else {
|
||||||
|
if(croppedUri != null) {
|
||||||
|
bitmap = getScaledBitmap(FileHelper.stripFileProtocol(croppedUri.toString()));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
bitmap = getScaledBitmap(FileHelper.stripFileProtocol(imageUri.toString()));
|
bitmap = getScaledBitmap(FileHelper.stripFileProtocol(imageUri.toString()));
|
||||||
|
}
|
||||||
|
|
||||||
if (rotate != 0 && this.correctOrientation) {
|
if (rotate != 0 && this.correctOrientation) {
|
||||||
bitmap = getRotatedBitmap(rotate, bitmap, exif);
|
bitmap = getRotatedBitmap(rotate, bitmap, exif);
|
||||||
|
Loading…
Reference in New Issue
Block a user