summaryrefslogtreecommitdiffstats
path: root/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2013-11-19 12:45:54 -0800
committerTim Murray <timmurray@google.com>2013-11-20 10:18:04 -0800
commit460a04971c494fec39ffcb38e873bb8fdd82d113 (patch)
treeb1567d93e44eec510a0c3adcd9bacd6f2542a860 /graphics/java/android/renderscript/ScriptIntrinsicHistogram.java
parenteff663f391fa4f119685d5c14489b94661ea126f (diff)
downloadframeworks_base-460a04971c494fec39ffcb38e873bb8fdd82d113.zip
frameworks_base-460a04971c494fec39ffcb38e873bb8fdd82d113.tar.gz
frameworks_base-460a04971c494fec39ffcb38e873bb8fdd82d113.tar.bz2
Convert Java/JNI to 64-bit, part 2.
This changes BaseObj to support 64-bit IDs. There are a few caveats: 1. Since it is deprecated, RSG will not support 64-bit. 2. Currently, methods that pass arrays of IDs to the driver are not supported in 64-bit. This will be fixed in a later CL. bug 11332320 Change-Id: If0dbecc8b285e260f767e441e05088b6a1b749a2
Diffstat (limited to 'graphics/java/android/renderscript/ScriptIntrinsicHistogram.java')
-rw-r--r--graphics/java/android/renderscript/ScriptIntrinsicHistogram.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java b/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java
index adc2d95..42e4d04 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java
+++ b/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java
@@ -28,7 +28,7 @@ import android.util.Log;
public final class ScriptIntrinsicHistogram extends ScriptIntrinsic {
private Allocation mOut;
- private ScriptIntrinsicHistogram(int id, RenderScript rs) {
+ private ScriptIntrinsicHistogram(long id, RenderScript rs) {
super(id, rs);
}
@@ -52,7 +52,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;
}