diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-10 13:45:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 13:45:15 +0000 |
| commit | f152d950854e3052c5d73aefa43d377c10d7d814 (patch) | |
| tree | 60589c8194114b072c2e188f4665a3ae3cd5c895 /rs/java/android/renderscript/FileA3D.java | |
| parent | dd99d87a125526fc31ef3601a5f1c0edace99a7a (diff) | |
| parent | 33a608a0a326d9671bffd6750cb5521d6687cc57 (diff) | |
am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '33a608a0a326d9671bffd6750cb5521d6687cc57':
AArch64: Use long for pointers in RS Java/JNI code
Diffstat (limited to 'rs/java/android/renderscript/FileA3D.java')
| -rw-r--r-- | rs/java/android/renderscript/FileA3D.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rs/java/android/renderscript/FileA3D.java b/rs/java/android/renderscript/FileA3D.java index f0acb56b84ad..41648101cc88 100644 --- a/rs/java/android/renderscript/FileA3D.java +++ b/rs/java/android/renderscript/FileA3D.java @@ -136,7 +136,7 @@ public class FileA3D extends BaseObj { return null; } - int objectID = rs.nFileA3DGetEntryByIndex(entry.mID, entry.mIndex); + long objectID = rs.nFileA3DGetEntryByIndex(entry.mID, entry.mIndex); if(objectID == 0) { return null; } @@ -292,7 +292,7 @@ public class FileA3D extends BaseObj { long fileId = 0; if (is instanceof AssetManager.AssetInputStream) { - int asset = ((AssetManager.AssetInputStream) is).getAssetInt(); + long asset = ((AssetManager.AssetInputStream) is).getNativeAsset(); fileId = rs.nFileA3DCreateFromAssetStream(asset); } else { throw new RSRuntimeException("Unsupported asset stream"); |