summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2013-11-20 22:46:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-20 22:46:47 +0000
commit84379677339b4a7a78be377e1c96d0da966e49cf (patch)
tree78b9aaa2b0da7120ce90ab25601ea5cd013d4522 /graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
parent52909212a6e5cc9f7d6bfff0d9a8440a2881fdb0 (diff)
parent460a04971c494fec39ffcb38e873bb8fdd82d113 (diff)
Merge "Convert Java/JNI to 64-bit, part 2."
Diffstat (limited to 'graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java')
-rw-r--r--graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java b/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
index 928bac8baeb0..8b668963f551 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
+++ b/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
@@ -24,7 +24,7 @@ public final class ScriptIntrinsicConvolve5x5 extends ScriptIntrinsic {
private final float[] mValues = new float[25];
private Allocation mInput;
- private ScriptIntrinsicConvolve5x5(int id, RenderScript rs) {
+ private ScriptIntrinsicConvolve5x5(long id, RenderScript rs) {
super(id, rs);
}
@@ -60,7 +60,7 @@ public final class ScriptIntrinsicConvolve5x5 extends ScriptIntrinsic {
throw new RSIllegalArgumentException("Unsuported element type.");
}
- int id = rs.nScriptIntrinsicCreate(4, e.getID(rs));
+ long id = rs.nScriptIntrinsicCreate(4, e.getID(rs));
return new ScriptIntrinsicConvolve5x5(id, rs);
}