diff options
author | Narayan Kamath <narayan@google.com> | 2014-01-16 12:12:11 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-16 12:12:11 +0000 |
commit | 98002dfb60a20caf62d6682659547c042a4a3342 (patch) | |
tree | 0b4a61520d922a49eae5de8b512c1137e5d955d6 /graphics | |
parent | 1b0f0be0979cbe00641d5d386691e87d668a2aa8 (diff) | |
parent | 0c10cc6052dc279f020e4adf069961e6e8f9dd6e (diff) | |
download | frameworks_base-98002dfb60a20caf62d6682659547c042a4a3342.zip frameworks_base-98002dfb60a20caf62d6682659547c042a4a3342.tar.gz frameworks_base-98002dfb60a20caf62d6682659547c042a4a3342.tar.bz2 |
Merge "AArch64: Use long for pointers in graphics/PathMeasure"
Diffstat (limited to 'graphics')
-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 7062824..e56716f 100644 --- a/graphics/java/android/graphics/PathMeasure.java +++ b/graphics/java/android/graphics/PathMeasure.java @@ -138,16 +138,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; } |