diff options
author | Tim Murray <timmurray@google.com> | 2013-11-20 22:46:46 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-20 22:46:47 +0000 |
commit | 84379677339b4a7a78be377e1c96d0da966e49cf (patch) | |
tree | 78b9aaa2b0da7120ce90ab25601ea5cd013d4522 /graphics/java/android/renderscript/ScriptIntrinsicHistogram.java | |
parent | 52909212a6e5cc9f7d6bfff0d9a8440a2881fdb0 (diff) | |
parent | 460a04971c494fec39ffcb38e873bb8fdd82d113 (diff) |
Merge "Convert Java/JNI to 64-bit, part 2."
Diffstat (limited to 'graphics/java/android/renderscript/ScriptIntrinsicHistogram.java')
-rw-r--r-- | graphics/java/android/renderscript/ScriptIntrinsicHistogram.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java b/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java index 5833fed2a3b5..536663d1de5e 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java +++ b/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java @@ -24,7 +24,7 @@ package android.renderscript; public final class ScriptIntrinsicHistogram extends ScriptIntrinsic { private Allocation mOut; - private ScriptIntrinsicHistogram(int id, RenderScript rs) { + private ScriptIntrinsicHistogram(long id, RenderScript rs) { super(id, rs); } @@ -48,7 +48,7 @@ public final class ScriptIntrinsicHistogram extends ScriptIntrinsic { (!e.isCompatible(Element.U8(rs)))) { throw new RSIllegalArgumentException("Unsuported element type."); } - int id = rs.nScriptIntrinsicCreate(9, e.getID(rs)); + long id = rs.nScriptIntrinsicCreate(9, e.getID(rs)); ScriptIntrinsicHistogram sib = new ScriptIntrinsicHistogram(id, rs); return sib; } |