diff options
| author | Stephen Hines <srhines@google.com> | 2014-07-08 21:29:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-08 21:29:14 +0000 |
| commit | 31012e2cef3f36183bcfd243278e969b29360c3e (patch) | |
| tree | 45bcc15730ce67925edced2d8861fd5e7fc03e43 /rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java | |
| parent | 908d35e79eb457f9fe5cecc33951ca68d2f80e30 (diff) | |
| parent | 957ec05ef67b5909e9e66bcf28eae29c2dc148b3 (diff) | |
am 957ec05e: am 70a3c558: Merge "Adds support for multi-input kernels to Frameworks/Base/RS."
* commit '957ec05ef67b5909e9e66bcf28eae29c2dc148b3':
Adds support for multi-input kernels to Frameworks/Base/RS.
Diffstat (limited to 'rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java')
| -rw-r--r-- | rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java index 25f3ee877ae5..586930ce245a 100644 --- a/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java +++ b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java @@ -108,7 +108,7 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { * type. */ public void forEach(Allocation aout) { - forEach(0, null, aout, null); + forEach(0, (Allocation) null, aout, null); } /** @@ -130,4 +130,3 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { } } - |