From 710e7d3cf526c9c578a8f342d121216945333fc7 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 22 Jun 2017 22:54:03 +0200 Subject: [PATCH] avoid rotating images by 0 degrees --- .../kotlin/com/simplemobiletools/camera/PhotoProcessor.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt b/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt index cc3e5b1c..e96626c0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/PhotoProcessor.kt @@ -75,7 +75,7 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId else -> 0 } - image = rotate(image, imageRot + deviceRot + previewRot) ?: return "" + image = rotate(image, (imageRot + deviceRot + previewRot) % 360) ?: return "" image.compress(Bitmap.CompressFormat.JPEG, 80, fos) fos?.close() return photoFile.absolutePath @@ -93,11 +93,14 @@ class PhotoProcessor(val activity: MainActivity, val uri: Uri?, val currCameraId } private fun rotate(bitmap: Bitmap, degree: Int): Bitmap? { + if (degree == 0) + return bitmap + val width = bitmap.width val height = bitmap.height val matrix = Matrix() - matrix.setRotate((degree % 360).toFloat()) + matrix.setRotate(degree.toFloat()) try { return Bitmap.createBitmap(bitmap, 0, 0, width, height, matrix, true) } catch (e: OutOfMemoryError) {