drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Path.native_trim should return long, not int.

Browse Source 
Change-Id: Idafc4c58eb86ad1af614d31f8cb05216bd869482
This commit is contained in:
Narayan Kamath
2014-01-29 09:38:37 +00:00
parent 2b033dce9f
commit e55bc7f157
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android/graphics/Path.cpp
View File

@ -516,7 +516,7 @@ public:
return result;
}
static SkPathMeasure* trim(JNIEnv* env, jobject clazz, jlong inPathPtr, jlong outPathPtr,
static jlong trim(JNIEnv* env, jobject clazz, jlong inPathPtr, jlong outPathPtr,
jlong pathMeasurePtr, jfloat trimStart, jfloat trimEnd, jfloat trimOffset) {
SkPath* inPath = reinterpret_cast<SkPath*>(inPathPtr);
SkPath* outPath = reinterpret_cast<SkPath*>(outPathPtr);
@ -525,7 +525,7 @@ public:
if (outPath != NULL) {
*outPath = *inPath;
}
return pathMeasure;
return reinterpret_cast<jlong>(pathMeasure);
}
bool modifyPath = (outPath == NULL);
@ -557,7 +557,7 @@ public:
*inPath = *outPath;
delete outPath;
}
return pathMeasure;
return reinterpret_cast<jlong>(pathMeasure);
}
static void destroyMeasure(JNIEnv* env, jobject clazz, jlong measure) {
@ -606,7 +606,7 @@ static JNINativeMethod methods[] = {
{"native_op","(JJIJ)Z", (void*) SkPathGlue::op},
{"native_approximate", "(JF)[F", (void*) SkPathGlue::approximate},
{"native_destroyMeasure","(J)V", (void*) SkPathGlue::destroyMeasure},
{"native_trim","(JJJFFF)I", (void*) SkPathGlue::trim},
{"native_trim","(JJJFFF)J", (void*) SkPathGlue::trim},
};
int register_android_graphics_Path(JNIEnv* env) {

2
graphics/java/android/graphics/Path.java
View File

@ -875,7 +875,7 @@ public class Path {
private static native boolean native_op(long path1, long path2, int op, long result);
private static native void finalizer(long nPath);
private static native float[] native_approximate(long nPath, float error);
private static native int native_trim(long nPath, long nTargetPath, long nPathMeasure,
private static native long native_trim(long nPath, long nTargetPath, long nPathMeasure,
float trimStart, float trimEnd, float trimOffset);
private static native void native_destroyMeasure(long nPathMeasure);
}