refactor: simplify image transformation methods in ImageUtils

ShiinaKin · Dec 18, 2024 · dcb102a · dcb102a
1 parent 92076f2
commit dcb102a
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/app/src/main/kotlin/io/sakurasou/util/ImageUtils.kt b/app/src/main/kotlin/io/sakurasou/util/ImageUtils.kt
@@ -178,28 +178,20 @@ object ImageUtils {
         }
     }
 
-    suspend fun transformImage(rawImage: BufferedImage, targetImageType: ImageType, quality: Double): ByteArray {
+    suspend fun transformImage(rawImage: BufferedImage, targetImageType: ImageType): ByteArray {
         return withContext(Dispatchers.IO) {
             ByteArrayOutputStream().apply {
                 Thumbnails.of(rawImage)
                     .outputFormat(targetImageType.name)
-                    .outputQuality(quality)
                     .toOutputStream(this)
             }.use { it.toByteArray() }
         }
     }
 
-    suspend fun transformImage(
-        rawImage: BufferedImage,
-        targetImageType: ImageType,
-        newWidth: Int,
-        newHeight: Int,
-        quality: Double
-    ): ByteArray {
+    suspend fun transformImage(rawImage: BufferedImage, targetImageType: ImageType, quality: Double): ByteArray {
         return withContext(Dispatchers.IO) {
             ByteArrayOutputStream().apply {
                 Thumbnails.of(rawImage)
-                    .size(newWidth, newHeight)
                     .outputFormat(targetImageType.name)
                     .outputQuality(quality)
                     .toOutputStream(this)
@@ -209,20 +201,20 @@ object ImageUtils {
 
     private fun transformImage(
         rawImage: BufferedImage,
-        targetType: String,
+        targetImageType: ImageType,
         newWidth: Int,
         newHeight: Int,
         quality: Double
     ): ByteArray = ByteArrayOutputStream()
         .apply {
             Thumbnails.of(rawImage)
                 .size(newWidth, newHeight)
-                .outputFormat(targetType)
+                .outputFormat(targetImageType.name)
                 .outputQuality(quality)
                 .toOutputStream(this)
         }.use { it.toByteArray() }
 
-    suspend fun transformImageByWidth(
+    private suspend fun transformImageByWidth(
         rawImage: BufferedImage,
         targetImageType: ImageType,
         newWidth: Int,
@@ -232,11 +224,11 @@ object ImageUtils {
             val originalWidth = rawImage.width
             val originalHeight = rawImage.height
             val newHeight = (originalHeight * newWidth) / originalWidth
-            transformImage(rawImage, targetImageType.name.lowercase(), newWidth, newHeight, quality)
+            transformImage(rawImage, targetImageType, newWidth, newHeight, quality)
         }
     }
 
-    suspend fun transformImageByHeight(
+    private suspend fun transformImageByHeight(
         rawImage: BufferedImage,
         targetImageType: ImageType,
         newHeight: Int,
@@ -246,7 +238,7 @@ object ImageUtils {
             val originalWidth = rawImage.width
             val originalHeight = rawImage.height
             val newWidth = (originalWidth * newHeight) / originalHeight
-            transformImage(rawImage, targetImageType.name.lowercase(), newWidth, newHeight, quality)
+            transformImage(rawImage, targetImageType, newWidth, newHeight, quality)
         }
     }
 }