diff options
| author | Stephen Hines <srhines@google.com> | 2014-07-08 21:18:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-07 17:50:18 +0000 |
| commit | 70a3c558645f8e693ce37577fdd61b8d1fd4ed9a (patch) | |
| tree | 0ab4a6ca4bd807cdc56609404dd71b0cebe73666 /rs/java/android/renderscript/ScriptIntrinsicResize.java | |
| parent | 912700fca8e02fe93fca7d95ef22472f77349ffe (diff) | |
| parent | 949610653fdf55dd2cb3c846047e6aa2c6d73f0d (diff) | |
Merge "Adds support for multi-input kernels to Frameworks/Base/RS."
Diffstat (limited to 'rs/java/android/renderscript/ScriptIntrinsicResize.java')
| -rw-r--r-- | rs/java/android/renderscript/ScriptIntrinsicResize.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/rs/java/android/renderscript/ScriptIntrinsicResize.java b/rs/java/android/renderscript/ScriptIntrinsicResize.java index cc37120f8030..816029f0c9b3 100644 --- a/rs/java/android/renderscript/ScriptIntrinsicResize.java +++ b/rs/java/android/renderscript/ScriptIntrinsicResize.java @@ -96,7 +96,7 @@ public final class ScriptIntrinsicResize extends ScriptIntrinsic { * @param opt LaunchOptions for clipping */ public void forEach_bicubic(Allocation aout, Script.LaunchOptions opt) { - forEach(0, null, aout, null, opt); + forEach(0, (Allocation) null, aout, null, opt); } /** @@ -110,4 +110,3 @@ public final class ScriptIntrinsicResize extends ScriptIntrinsic { } - |