From 949610653fdf55dd2cb3c846047e6aa2c6d73f0d Mon Sep 17 00:00:00 2001
From: Chris Wailes <chriswailes@google.com>
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/ScriptIntrinsicBlur.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'rs/java/android/renderscript/ScriptIntrinsicBlur.java')

diff --git a/rs/java/android/renderscript/ScriptIntrinsicBlur.java b/rs/java/android/renderscript/ScriptIntrinsicBlur.java
index d1a6fedec6cd..c153712898c4 100644
--- a/rs/java/android/renderscript/ScriptIntrinsicBlur.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicBlur.java
@@ -88,7 +88,7 @@ public final class ScriptIntrinsicBlur extends ScriptIntrinsic {
      *             type.
      */
     public void forEach(Allocation aout) {
-        forEach(0, null, aout, null);
+        forEach(0, (Allocation) null, aout, null);
     }
 
     /**
@@ -109,4 +109,3 @@ public final class ScriptIntrinsicBlur extends ScriptIntrinsic {
         return createFieldID(1, null);
     }
 }
-
-- 
cgit v1.2.3