commit e7934a6576187486e6474aba28b14001afd7422c
author Raph Levien <raph@google.com> Wed Jun 03 18:04:02 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 03 18:04:10 2015 +0000
tree 95ae2f7e6c0712d7273608f2398c1ddd4fbf2dc4
parent 844fbff80c72771d21ddabf13de8fe91312c3cd6
parent 36ff86c9a3d61dfab43b7f35631bf86d65150252

Merge "Apply contextStart consistently in getRunAdvance" into mnc-dev

core/jni/android/graphics/Paint.cpp

diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp
index 63395ed..d14fc0f 100644
--- a/core/jni/android/graphics/Paint.cpp
+++ b/core/jni/android/graphics/Paint.cpp
@@ -1055,7 +1055,8 @@
         // TODO performance: optimize JNI array access
         jchar* textArray = env->GetCharArrayElements(text, NULL);
         jfloat result = doRunAdvance(paint, typeface, textArray + contextStart,
-                start - contextStart, end - start, contextEnd - contextStart, isRtl, offset);
+                start - contextStart, end - start, contextEnd - contextStart, isRtl,
+                offset - contextStart);
         env->ReleaseCharArrayElements(text, textArray, JNI_ABORT);
         return result;
     }