Merge branch 'master' into master-ghc9

This commit is contained in:
Evgeny Poberezkin
2023-08-25 17:50:01 +01:00
12 changed files with 166 additions and 33 deletions
@@ -15,6 +15,7 @@ expect fun compressImageData(bitmap: ImageBitmap, usePng: Boolean): ByteArrayOut
expect fun GrayU8.toImageBitmap(): ImageBitmap
expect fun ImageBitmap.hasAlpha(): Boolean
expect fun ImageBitmap.addLogo(): ImageBitmap
expect fun ImageBitmap.scale(width: Int, height: Int): ImageBitmap
@@ -102,7 +102,7 @@ fun saveImage(uri: URI): String? {
fun saveImage(image: ImageBitmap): String? {
return try {
val ext = if (image.hasAlpha) "png" else "jpg"
val ext = if (image.hasAlpha()) "png" else "jpg"
val dataResized = resizeImageToDataSize(image, ext == "png", maxDataSize = MAX_IMAGE_SIZE)
val fileToSave = generateNewFileName("IMG", ext)
val file = File(getAppFilePath(fileToSave))
@@ -112,7 +112,7 @@ fun saveImage(image: ImageBitmap): String? {
output.close()
fileToSave
} catch (e: Exception) {
Log.e(TAG, "Util.kt saveImage error: ${e.message}")
Log.e(TAG, "Util.kt saveImage error: ${e.stackTraceToString()}")
null
}
}