diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2013-03-15 11:22:29 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2013-03-15 11:22:29 -0700 |
commit | a4bf8114a73371b51a0eba9d5d61dfeb597a1abb (patch) | |
tree | be80aee54242c844266ce56d9f99c7060440b826 /core | |
parent | e0e448f181ef5be8491bcef8e787fb96a7719c77 (diff) | |
download | frameworks_base-a4bf8114a73371b51a0eba9d5d61dfeb597a1abb.zip frameworks_base-a4bf8114a73371b51a0eba9d5d61dfeb597a1abb.tar.gz frameworks_base-a4bf8114a73371b51a0eba9d5d61dfeb597a1abb.tar.bz2 |
Revert "fix argument mismatches in Paint JNI"
This reverts commit b61fb10fe435b74a761e82f517abd0320f22193e.
Diffstat (limited to 'core')
-rw-r--r-- | core/jni/android/graphics/Paint.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp index 07f55e0..e830492 100644 --- a/core/jni/android/graphics/Paint.cpp +++ b/core/jni/android/graphics/Paint.cpp @@ -548,7 +548,7 @@ public: } static jint doTextRunCursor(JNIEnv *env, SkPaint* paint, const jchar *text, jint start, - jint count, jint offset, jint opt) { + jint count, jint flags, jint offset, jint opt) { jfloat scalarArray[count]; TextLayout::getTextRunAdvances(paint, text, start, count, start + count, @@ -592,19 +592,19 @@ public: } static jint getTextRunCursor___C(JNIEnv* env, jobject clazz, SkPaint* paint, jcharArray text, - jint contextStart, jint contextCount, jint offset, jint cursorOpt) { + jint contextStart, jint contextCount, jint flags, jint offset, jint cursorOpt) { jchar* textArray = env->GetCharArrayElements(text, NULL); - jint result = doTextRunCursor(env, paint, textArray, contextStart, contextCount, + jint result = doTextRunCursor(env, paint, textArray, contextStart, contextCount, flags, offset, cursorOpt); env->ReleaseCharArrayElements(text, textArray, JNI_ABORT); return result; } static jint getTextRunCursor__String(JNIEnv* env, jobject clazz, SkPaint* paint, jstring text, - jint contextStart, jint contextEnd, jint offset, jint cursorOpt) { + jint contextStart, jint contextEnd, jint flags, jint offset, jint cursorOpt) { const jchar* textArray = env->GetStringChars(text, NULL); jint result = doTextRunCursor(env, paint, textArray, contextStart, - contextEnd - contextStart, offset, cursorOpt); + contextEnd - contextStart, flags, offset, cursorOpt); env->ReleaseStringChars(text, textArray); return result; } |