diff options
author | Narayan Kamath <narayan@google.com> | 2014-01-16 15:57:58 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-16 15:57:58 +0000 |
commit | 4d7f9450663468abf5e41e24b7d3b1d5c3ea6143 (patch) | |
tree | 8ccbceaa816cf5b32acdddd803e121e8ad5a69cd /graphics/java | |
parent | f25afde8dd24e6a23e3a25c05c9ad2965d0ac96e (diff) | |
parent | 8492e88a23ee4ac32f05b277654e0f9455fefa9b (diff) | |
download | frameworks_base-4d7f9450663468abf5e41e24b7d3b1d5c3ea6143.zip frameworks_base-4d7f9450663468abf5e41e24b7d3b1d5c3ea6143.tar.gz frameworks_base-4d7f9450663468abf5e41e24b7d3b1d5c3ea6143.tar.bz2 |
am 8492e88a: am 077386db: am 6b81bfd1: am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
* commit '8492e88a23ee4ac32f05b277654e0f9455fefa9b':
AArch64: Use long for pointers in graphics/PathMeasure
Diffstat (limited to 'graphics/java')
-rw-r--r-- | graphics/java/android/graphics/PathMeasure.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/graphics/java/android/graphics/PathMeasure.java b/graphics/java/android/graphics/PathMeasure.java index dba1943..ba2228c 100644 --- a/graphics/java/android/graphics/PathMeasure.java +++ b/graphics/java/android/graphics/PathMeasure.java @@ -144,16 +144,16 @@ public class PathMeasure { native_destroy(native_instance); } - private static native int native_create(int native_path, boolean forceClosed); - private static native void native_setPath(int native_instance, int native_path, boolean forceClosed); - private static native float native_getLength(int native_instance); - private static native boolean native_getPosTan(int native_instance, float distance, float pos[], float tan[]); - private static native boolean native_getMatrix(int native_instance, float distance, int native_matrix, int flags); - private static native boolean native_getSegment(int native_instance, float startD, float stopD, int native_path, boolean startWithMoveTo); - private static native boolean native_isClosed(int native_instance); - private static native boolean native_nextContour(int native_instance); - private static native void native_destroy(int native_instance); + private static native long native_create(long native_path, boolean forceClosed); + private static native void native_setPath(long native_instance, long native_path, boolean forceClosed); + private static native float native_getLength(long native_instance); + private static native boolean native_getPosTan(long native_instance, float distance, float pos[], float tan[]); + private static native boolean native_getMatrix(long native_instance, float distance, long native_matrix, int flags); + private static native boolean native_getSegment(long native_instance, float startD, float stopD, long native_path, boolean startWithMoveTo); + private static native boolean native_isClosed(long native_instance); + private static native boolean native_nextContour(long native_instance); + private static native void native_destroy(long native_instance); - /* package */private final int native_instance; + /* package */private final long native_instance; } |