diff options
| author | Xin Li <delphij@google.com> | 2024-03-06 09:29:56 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-03-06 09:29:56 -0800 |
| commit | d1f5247bb3ef3470628c5ef40af3e6f9d30680c3 (patch) | |
| tree | 14a6aad3821b7ddd0c3216195de4338bcbeb2eea | |
| parent | 79243212612eb1752a7578663c80691a41e76ee3 (diff) | |
| parent | eaaba9616c65de11d3840fc223178afcb711727e (diff) | |
| download | renderscript-intrinsics-replacement-toolkit-d1f5247bb3ef3470628c5ef40af3e6f9d30680c3.tar.gz | |
Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: Idfaaa5395cf6d72222d2d47b1ca2b3660aeed899
Change-Id: I3d7ae2d274fb81151868d33f76ccad910f5ba975
| -rw-r--r-- | renderscript-toolkit/src/main/java/com/google/android/renderscript/Toolkit.kt | 2 | ||||
| -rw-r--r-- | test-app/src/main/java/com/google/android/renderscript_test/BufferUtils.kt | 2 |
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 |