fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-02-20 21:30:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

use the functions from Commons for saving rotated images

Browse Source
This commit is contained in:
tibbi 2018-04-01 12:12:46 +02:00
parent 1bade23297
commit 15e24a7f83
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -45,7 +45,7 @@ ext {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:3.17.21' implementation 'com.simplemobiletools:commons:3.17.22'
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion" debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion" releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion"

20
app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt
View File

@ -78,7 +78,7 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId
val imageRot = orient.degreesFromOrientation() val imageRot = orient.degreesFromOrientation()
val totalRotation = (imageRot + deviceRot + previewRot) % 360 val totalRotation = (imageRot + deviceRot + previewRot) % 360
if (!path.startsWith(activity.internalStoragePath) && !isNougatPlus()) { if (!activity.isPathOnSD(path) && !isNougatPlus()) {
image = rotate(image, totalRotation) image = rotate(image, totalRotation)
} }
@ -100,16 +100,7 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId
val fileExif = ExifInterface(path) val fileExif = ExifInterface(path)
image.compress(Bitmap.CompressFormat.JPEG, activity.config.photoQuality, fos) image.compress(Bitmap.CompressFormat.JPEG, activity.config.photoQuality, fos)
if (path.startsWith(activity.internalStoragePath)) { activity.saveImageRotation(path, totalRotation)
saveExifRotation(ExifInterface(path), totalRotation)
} else if (isNougatPlus()) {
val documentFile = activity.getSomeDocumentFile(path)
if (documentFile != null) {
val parcelFileDescriptor = activity.contentResolver.openFileDescriptor(documentFile.uri, "rw")
val fileDescriptor = parcelFileDescriptor.fileDescriptor
saveExifRotation(ExifInterface(fileDescriptor), totalRotation)
}
}
if (activity.config.savePhotoMetadata) { if (activity.config.savePhotoMetadata) {
tempExif.copyTo(fileExif) tempExif.copyTo(fileExif)
@ -124,13 +115,6 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId
return "" return ""
} }
private fun saveExifRotation(exif: ExifInterface, degrees: Int) {
val orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)
val orientationDegrees = (orientation.degreesFromOrientation() + degrees) % 360
exif.setAttribute(ExifInterface.TAG_ORIENTATION, orientationDegrees.orientationFromDegrees())
exif.saveAttributes()
}
private fun rotate(bitmap: Bitmap, degree: Int): Bitmap? { private fun rotate(bitmap: Bitmap, degree: Int): Bitmap? {
if (degree == 0) { if (degree == 0) {
return bitmap return bitmap