commit 949610653fdf55dd2cb3c846047e6aa2c6d73f0d
author Chris Wailes <chriswailes@google.com> Wed Jun 11 12:01:28 2014 -0700
committer Chris Wailes <chriswailes@google.com> Mon Jul 07 12:27:21 2014 -0700
tree 3062df8ab3960637b2179d4caf688ca97228e627
parent ef2e76675a6c60a2a4764a2e19fdb2c4d9beb00e

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/ScriptIntrinsicConvolve3x3.java

diff --git a/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
index 25f3ee8..586930c 100644
--- a/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
@@ -108,7 +108,7 @@
      *             type.
      */
     public void forEach(Allocation aout) {
-        forEach(0, null, aout, null);
+        forEach(0, (Allocation) null, aout, null);
     }
 
     /**
@@ -130,4 +130,3 @@
     }
 
 }
-