From 949610653fdf55dd2cb3c846047e6aa2c6d73f0d Mon Sep 17 00:00:00 2001 From: Chris Wailes Date: Wed, 11 Jun 2014 12:01:28 -0700 Subject: 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 --- rs/java/android/renderscript/ScriptIntrinsicResize.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'rs/java/android/renderscript/ScriptIntrinsicResize.java') 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 { } - -- cgit v1.2.3