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

Merge "Revert "fix argument mismatches in Paint JNI"" into jb-mr2-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2013-03-15 20:33:21 +00:00
committed by Android (Google) Code Review
parent 1b36449830 a4bf8114a7
commit fe099074c4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/jni/android/graphics/Paint.cpp
View File

@ -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;
}

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

@ -1851,7 +1851,7 @@ public class Paint {
* @hide
*/
public int getTextRunCursor(String text, int contextStart, int contextEnd,
int offset, int cursorOpt) {
int flags, int offset, int cursorOpt) {
if (((contextStart | contextEnd | offset | (contextEnd - contextStart)
| (offset - contextStart) | (contextEnd - offset)
| (text.length() - contextEnd) | cursorOpt) < 0)