Snap for 10843824 from 33a0ebed30333dd096a57e1fcb66ba6f213c7010 to 24Q1-release
Change-Id: I5e0979263b00a54eee63b20bd1ae5279f0b060a3
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 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 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
