diff options
| author | Tim Murray <timmurray@google.com> | 2014-02-03 22:36:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-03 22:36:45 +0000 |
| commit | b4cf2a2aee78b0ed3e75b5a07baaf5479fe708d9 (patch) | |
| tree | aeb1718593854c711147091e059237c758451a0e /graphics/java/android/renderscript/ScriptIntrinsicBlend.java | |
| parent | e22e268e6d158f37173b1bce37a5614daabcf18c (diff) | |
| parent | 7a629fac82f88126642081b4474879f6a883e313 (diff) | |
| download | frameworks_base-b4cf2a2aee78b0ed3e75b5a07baaf5479fe708d9.zip frameworks_base-b4cf2a2aee78b0ed3e75b5a07baaf5479fe708d9.tar.gz frameworks_base-b4cf2a2aee78b0ed3e75b5a07baaf5479fe708d9.tar.bz2 | |
Merge "Convert Java/JNI to 64-bit, part 2."
Diffstat (limited to 'graphics/java/android/renderscript/ScriptIntrinsicBlend.java')
| -rw-r--r-- | graphics/java/android/renderscript/ScriptIntrinsicBlend.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicBlend.java b/graphics/java/android/renderscript/ScriptIntrinsicBlend.java index 0e05bc8..40f1a3e 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicBlend.java +++ b/graphics/java/android/renderscript/ScriptIntrinsicBlend.java @@ -21,7 +21,7 @@ package android.renderscript; * Intrinsic kernels for blending two {@link android.renderscript.Allocation} objects. **/ public class ScriptIntrinsicBlend extends ScriptIntrinsic { - ScriptIntrinsicBlend(int id, RenderScript rs) { + ScriptIntrinsicBlend(long id, RenderScript rs) { super(id, rs); } @@ -35,7 +35,7 @@ public class ScriptIntrinsicBlend extends ScriptIntrinsic { */ public static ScriptIntrinsicBlend create(RenderScript rs, Element e) { // 7 comes from RS_SCRIPT_INTRINSIC_ID_BLEND in rsDefines.h - int id = rs.nScriptIntrinsicCreate(7, e.getID(rs)); + long id = rs.nScriptIntrinsicCreate(7, e.getID(rs)); return new ScriptIntrinsicBlend(id, rs); } |
