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/Font.java | |
parent | dd99d87a125526fc31ef3601a5f1c0edace99a7a (diff) | |
parent | 33a608a0a326d9671bffd6750cb5521d6687cc57 (diff) | |
download | frameworks_base-f152d950854e3052c5d73aefa43d377c10d7d814.zip frameworks_base-f152d950854e3052c5d73aefa43d377c10d7d814.tar.gz frameworks_base-f152d950854e3052c5d73aefa43d377c10d7d814.tar.bz2 |
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/Font.java')
-rw-r--r-- | rs/java/android/renderscript/Font.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rs/java/android/renderscript/Font.java b/rs/java/android/renderscript/Font.java index 4cd89db..b22aeb7 100644 --- a/rs/java/android/renderscript/Font.java +++ b/rs/java/android/renderscript/Font.java @@ -148,7 +148,7 @@ public class Font extends BaseObj { return "DroidSans.ttf"; } - Font(int id, RenderScript rs) { + Font(long id, RenderScript rs) { super(id, rs); } @@ -159,7 +159,7 @@ public class Font extends BaseObj { static public Font createFromFile(RenderScript rs, Resources res, String path, float pointSize) { rs.validate(); int dpi = res.getDisplayMetrics().densityDpi; - int fontId = rs.nFontCreateFromFile(path, pointSize, dpi); + long fontId = rs.nFontCreateFromFile(path, pointSize, dpi); if(fontId == 0) { throw new RSRuntimeException("Unable to create font from file " + path); @@ -184,7 +184,7 @@ public class Font extends BaseObj { AssetManager mgr = res.getAssets(); int dpi = res.getDisplayMetrics().densityDpi; - int fontId = rs.nFontCreateFromAsset(mgr, path, pointSize, dpi); + long fontId = rs.nFontCreateFromAsset(mgr, path, pointSize, dpi); if(fontId == 0) { throw new RSRuntimeException("Unable to create font from asset " + path); } @@ -208,9 +208,9 @@ public class Font extends BaseObj { int dpi = res.getDisplayMetrics().densityDpi; - int fontId = 0; + long fontId = 0; if (is instanceof AssetManager.AssetInputStream) { - int asset = ((AssetManager.AssetInputStream) is).getAssetInt(); + long asset = ((AssetManager.AssetInputStream) is).getNativeAsset(); fontId = rs.nFontCreateFromAssetStream(name, pointSize, dpi, asset); } else { throw new RSRuntimeException("Unsupported asset stream created"); |