diff options
| author | Tim Murray <timmurray@google.com> | 2014-02-03 14:41:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-03 14:41:14 -0800 |
| commit | 8df3ea66994e96d72040c44099dd2d74ba15ec67 (patch) | |
| tree | b4e6a48f8fe02dc84efdc3f47a74c3fe4f3cbfbb /graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java | |
| parent | 72d637e297a143e5b18c8e8f4eb85695ed6b10f1 (diff) | |
| parent | b4cf2a2aee78b0ed3e75b5a07baaf5479fe708d9 (diff) | |
| download | frameworks_base-8df3ea66994e96d72040c44099dd2d74ba15ec67.zip frameworks_base-8df3ea66994e96d72040c44099dd2d74ba15ec67.tar.gz frameworks_base-8df3ea66994e96d72040c44099dd2d74ba15ec67.tar.bz2 | |
am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
* commit 'b4cf2a2aee78b0ed3e75b5a07baaf5479fe708d9':
Convert Java/JNI to 64-bit, part 2.
Diffstat (limited to 'graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java')
| -rw-r--r-- | graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java b/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java index 5d3c1d3..25f3ee8 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java +++ b/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java @@ -26,7 +26,7 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { private final float[] mValues = new float[9]; private Allocation mInput; - private ScriptIntrinsicConvolve3x3(int id, RenderScript rs) { + private ScriptIntrinsicConvolve3x3(long id, RenderScript rs) { super(id, rs); } @@ -61,7 +61,7 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { !e.isCompatible(Element.F32_4(rs))) { throw new RSIllegalArgumentException("Unsuported element type."); } - int id = rs.nScriptIntrinsicCreate(1, e.getID(rs)); + long id = rs.nScriptIntrinsicCreate(1, e.getID(rs)); ScriptIntrinsicConvolve3x3 si = new ScriptIntrinsicConvolve3x3(id, rs); si.setCoefficients(f); return si; |
