diff options
| author | Stephen Hines <srhines@google.com> | 2014-07-08 21:25:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-08 21:25:19 +0000 |
| commit | 957ec05ef67b5909e9e66bcf28eae29c2dc148b3 (patch) | |
| tree | 1dc12bc664c2ff97652ec93d78733ba7085425c5 /rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java | |
| parent | a7efe9b8743e4a7d8a5b9ef247f6d780f33b4021 (diff) | |
| parent | 70a3c558645f8e693ce37577fdd61b8d1fd4ed9a (diff) | |
am 70a3c558: Merge "Adds support for multi-input kernels to Frameworks/Base/RS."
* commit '70a3c558645f8e693ce37577fdd61b8d1fd4ed9a':
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 { } } - |