Fix PuzzleMerge.kt: use maxOf instead of max

2026-03-05 21:14:25 +08:00
parent 65adbee8b8
commit a624dae001
12 changed files with 1 additions and 1 deletions
--- a/.gradle/8.2/checksums/checksums.lock
+++ b/.gradle/8.2/checksums/checksums.lock
--- a/.gradle/8.2/checksums/md5-checksums.bin
+++ b/.gradle/8.2/checksums/md5-checksums.bin
--- a/.gradle/8.2/checksums/sha1-checksums.bin
+++ b/.gradle/8.2/checksums/sha1-checksums.bin
--- a/.gradle/8.2/executionHistory/executionHistory.bin
+++ b/.gradle/8.2/executionHistory/executionHistory.bin
--- a/.gradle/8.2/executionHistory/executionHistory.lock
+++ b/.gradle/8.2/executionHistory/executionHistory.lock
--- a/.gradle/8.2/fileHashes/fileHashes.bin
+++ b/.gradle/8.2/fileHashes/fileHashes.bin
--- a/.gradle/8.2/fileHashes/fileHashes.lock
+++ b/.gradle/8.2/fileHashes/fileHashes.lock
--- a/.gradle/8.2/fileHashes/resourceHashesCache.bin
+++ b/.gradle/8.2/fileHashes/resourceHashesCache.bin
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/.gradle/buildOutputCleanup/outputFiles.bin
--- a/.gradle/file-system.probe
+++ b/.gradle/file-system.probe
--- a/app/src/main/java/com/inspection/camera/util/PuzzleMerge.kt
+++ b/app/src/main/java/com/inspection/camera/util/PuzzleMerge.kt
@@ -47,7 +47,7 @@ object PuzzleMerge {
            context.contentResolver.openInputStream(uri).use { ins ->
                BitmapFactory.decodeStream(ins, null, opts)
            }
-            val inSample = maxOf(1, max(opts.outWidth / maxW, opts.outHeight / maxH))
+            val inSample = maxOf(1, maxOf(opts.outWidth / maxW, opts.outHeight / maxH))
            val opts2 = BitmapFactory.Options().apply { inSampleSize = inSample }
            context.contentResolver.openInputStream(uri).use { ins ->
                BitmapFactory.decodeStream(ins, null, opts2)