aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2024-01-17 22:13:59 -0800
committerXin Li <delphij@google.com>2024-01-17 22:13:59 -0800
commiteaaba9616c65de11d3840fc223178afcb711727e (patch)
tree14a6aad3821b7ddd0c3216195de4338bcbeb2eea
parent79243212612eb1752a7578663c80691a41e76ee3 (diff)
parent33a0ebed30333dd096a57e1fcb66ba6f213c7010 (diff)
downloadrenderscript-intrinsics-replacement-toolkit-eaaba9616c65de11d3840fc223178afcb711727e.tar.gz
Merge Android 24Q1 Release (ab/11220357)temp_319669529
Bug: 319669529 Merged-In: I2308e56647b4acedcaf7109b64d6b54fc1fe2aa3 Change-Id: Idfaaa5395cf6d72222d2d47b1ca2b3660aeed899
-rw-r--r--renderscript-toolkit/src/main/java/com/google/android/renderscript/Toolkit.kt2
-rw-r--r--test-app/src/main/java/com/google/android/renderscript_test/BufferUtils.kt2
2 files changed, 2 insertions, 2 deletions
diff --git a/renderscript-toolkit/src/main/java/com/google/android/renderscript/Toolkit.kt b/renderscript-toolkit/src/main/java/com/google/android/renderscript/Toolkit.kt
index 8d761cb..ab1d842 100644
--- a/renderscript-toolkit/src/main/java/com/google/android/renderscript/Toolkit.kt
+++ b/renderscript-toolkit/src/main/java/com/google/android/renderscript/Toolkit.kt
@@ -1498,7 +1498,7 @@ internal fun validateBitmap(
}
internal fun createCompatibleBitmap(inputBitmap: Bitmap) =
- Bitmap.createBitmap(inputBitmap.width, inputBitmap.height, inputBitmap.config)
+ Bitmap.createBitmap(inputBitmap.width, inputBitmap.height, inputBitmap.config!!)
internal fun validateHistogramDotCoefficients(
coefficients: FloatArray?,
diff --git a/test-app/src/main/java/com/google/android/renderscript_test/BufferUtils.kt b/test-app/src/main/java/com/google/android/renderscript_test/BufferUtils.kt
index 51ece8e..c750677 100644
--- a/test-app/src/main/java/com/google/android/renderscript_test/BufferUtils.kt
+++ b/test-app/src/main/java/com/google/android/renderscript_test/BufferUtils.kt
@@ -480,7 +480,7 @@ fun vectorSizeOfBitmap(bitmap: Bitmap): Int {
}
fun duplicateBitmap(original: Bitmap): Bitmap {
- val copy = Bitmap.createBitmap(original.width, original.height, original.config)
+ val copy = Bitmap.createBitmap(original.width, original.height, original.config!!)
val canvas = Canvas(copy)
canvas.drawBitmap(original, 0f, 0f, null)
return copy