update Kotlin to 1.7.10 and fix some (new?) warnings (#2647)
* update Kotlin to 1.7.10 and fix some (new?) warnings * remove unused import
This commit is contained in:
parent
12e42e9b2b
commit
4f0f9a7a12
11 changed files with 17 additions and 65 deletions
|
|
@ -23,7 +23,6 @@ import android.graphics.Matrix
|
|||
import android.net.Uri
|
||||
import android.provider.OpenableColumns
|
||||
import android.util.Log
|
||||
import androidx.annotation.Px
|
||||
import androidx.exifinterface.media.ExifInterface
|
||||
import java.io.File
|
||||
import java.io.FileNotFoundException
|
||||
|
|
@ -68,43 +67,6 @@ fun getMediaSize(contentResolver: ContentResolver, uri: Uri?): Long {
|
|||
return mediaSize
|
||||
}
|
||||
|
||||
fun getSampledBitmap(contentResolver: ContentResolver, uri: Uri, @Px reqWidth: Int, @Px reqHeight: Int): Bitmap? {
|
||||
// First decode with inJustDecodeBounds=true to check dimensions
|
||||
val options = BitmapFactory.Options()
|
||||
options.inJustDecodeBounds = true
|
||||
var stream: InputStream?
|
||||
try {
|
||||
stream = contentResolver.openInputStream(uri)
|
||||
} catch (e: FileNotFoundException) {
|
||||
Log.w(TAG, e)
|
||||
return null
|
||||
}
|
||||
|
||||
BitmapFactory.decodeStream(stream, null, options)
|
||||
|
||||
IOUtils.closeQuietly(stream)
|
||||
|
||||
// Calculate inSampleSize
|
||||
options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight)
|
||||
|
||||
// Decode bitmap with inSampleSize set
|
||||
options.inJustDecodeBounds = false
|
||||
return try {
|
||||
stream = contentResolver.openInputStream(uri)
|
||||
val bitmap = BitmapFactory.decodeStream(stream, null, options)
|
||||
val orientation = getImageOrientation(uri, contentResolver)
|
||||
reorientBitmap(bitmap, orientation)
|
||||
} catch (e: FileNotFoundException) {
|
||||
Log.w(TAG, e)
|
||||
null
|
||||
} catch (e: OutOfMemoryError) {
|
||||
Log.e(TAG, "OutOfMemoryError while trying to get sampled Bitmap", e)
|
||||
null
|
||||
} finally {
|
||||
IOUtils.closeQuietly(stream)
|
||||
}
|
||||
}
|
||||
|
||||
@Throws(FileNotFoundException::class)
|
||||
fun getImageSquarePixels(contentResolver: ContentResolver, uri: Uri): Long {
|
||||
val input = contentResolver.openInputStream(uri)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue