summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ScriptIntrinsic3DLUT.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/ScriptIntrinsic3DLUT.java
parent52909212a6e5cc9f7d6bfff0d9a8440a2881fdb0 (diff)
parent460a04971c494fec39ffcb38e873bb8fdd82d113 (diff)
Merge "Convert Java/JNI to 64-bit, part 2."
Diffstat (limited to 'graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java')
-rw-r--r--graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java b/graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java
index 9bc2cd4a7721..33e64bd4197d 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java
+++ b/graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java
@@ -28,7 +28,7 @@ public final class ScriptIntrinsic3DLUT extends ScriptIntrinsic {
private Allocation mLUT;
private Element mElement;
- private ScriptIntrinsic3DLUT(int id, RenderScript rs, Element e) {
+ private ScriptIntrinsic3DLUT(long id, RenderScript rs, Element e) {
super(id, rs);
mElement = e;
}
@@ -44,7 +44,7 @@ public final class ScriptIntrinsic3DLUT extends ScriptIntrinsic {
* @return ScriptIntrinsic3DLUT
*/
public static ScriptIntrinsic3DLUT create(RenderScript rs, Element e) {
- int id = rs.nScriptIntrinsicCreate(8, e.getID(rs));
+ long id = rs.nScriptIntrinsicCreate(8, e.getID(rs));
if (!e.isCompatible(Element.U8_4(rs))) {
throw new RSIllegalArgumentException("Element must be compatible with uchar4.");