fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

rotate photos by exif if we are storing them on the internal storage

Browse Source
This commit is contained in:
tibbi
2017-09-21 22:24:33 +02:00
parent 1b01fce15b
commit 02978b8375
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,10 +12,7 @@ import com.simplemobiletools.camera.extensions.compensateDeviceRotation
import com.simplemobiletools.camera.extensions.config import com.simplemobiletools.camera.extensions.config
import com.simplemobiletools.camera.extensions.getOutputMediaFile import com.simplemobiletools.camera.extensions.getOutputMediaFile
import com.simplemobiletools.camera.extensions.getPreviewRotation import com.simplemobiletools.camera.extensions.getPreviewRotation
import com.simplemobiletools.commons.extensions.getFileDocument import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.extensions.needsStupidWritePermissions
import com.simplemobiletools.commons.extensions.showErrorToast
import com.simplemobiletools.commons.extensions.toast
import java.io.File import java.io.File
import java.io.FileOutputStream import java.io.FileOutputStream
import java.io.OutputStream import java.io.OutputStream
@ -67,9 +64,22 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId
else -> 0 else -> 0
} }
image = rotate(image, (imageRot + deviceRot + previewRot) % 360) ?: return "" val totalRotation = (imageRot + deviceRot + previewRot) % 360
val fileExif = ExifInterface(path)
var exifOrientation = ExifInterface.ORIENTATION_NORMAL.toString()
if (path.startsWith(activity.internalStoragePath)) {
exifOrientation = getExifOrientation(totalRotation)
} else {
image = rotate(image, totalRotation)
}
if (image != null) {
image.compress(Bitmap.CompressFormat.JPEG, 80, fos) image.compress(Bitmap.CompressFormat.JPEG, 80, fos)
fos?.close() fos?.close()
}
fileExif.setAttribute(ExifInterface.TAG_ORIENTATION, exifOrientation)
fileExif.saveAttributes()
return photoFile.absolutePath return photoFile.absolutePath
} catch (e: Exception) { } catch (e: Exception) {
activity.showErrorToast(e) activity.showErrorToast(e)
@ -80,6 +90,15 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId
return "" return ""
} }
private fun getExifOrientation(degrees: Int): String {
return when (degrees) {
90 -> ExifInterface.ORIENTATION_ROTATE_90
180 -> ExifInterface.ORIENTATION_ROTATE_180
270 -> ExifInterface.ORIENTATION_ROTATE_270
else -> ExifInterface.ORIENTATION_NORMAL
}.toString()
}
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