diff options
| author | Chris Wailes <chriswailes@google.com> | 2014-06-11 12:01:28 -0700 |
|---|---|---|
| committer | Chris Wailes <chriswailes@google.com> | 2014-07-07 12:27:21 -0700 |
| commit | 949610653fdf55dd2cb3c846047e6aa2c6d73f0d (patch) | |
| tree | 3062df8ab3960637b2179d4caf688ca97228e627 /rs/java/android/renderscript/ScriptIntrinsicResize.java | |
| parent | ef2e76675a6c60a2a4764a2e19fdb2c4d9beb00e (diff) | |
| download | frameworks_base-949610653fdf55dd2cb3c846047e6aa2c6d73f0d.zip frameworks_base-949610653fdf55dd2cb3c846047e6aa2c6d73f0d.tar.gz frameworks_base-949610653fdf55dd2cb3c846047e6aa2c6d73f0d.tar.bz2 | |
Adds support for multi-input kernels to Frameworks/Base/RS.
* Added a new JNI call to pass arrays of Allocations to the RS runtime.
* Added a new version of ForEach that takes an array of Allocations.
* Added some casts to disambiguate existing calls to forEach.
Change-Id: I46d2834c37075b2a2407fd8b010546818a4540d1
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 cc37120..816029f 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 { } - |