commit aea43f8414c79492beccc55a274700b644bf747a
author Keisuke Kuroyanagi <ksk@google.com> Fri Apr 01 05:27:35 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 01 05:27:38 2016 +0000
tree e10bb4233457941578b2d7d2345259fc22f6372e
parent c1b8e883294c8f1422cb8ac5aefde0d7c5481c66
parent b3677715e64277fb59045684a7722ef8a8ab2541

Merge "Fix: doRunAdvance returns wrong value when offset == count." into nyc-dev

core/jni/android/graphics/Paint.cpp

diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp
index 27d8fed..1844a98 100644
--- a/core/jni/android/graphics/Paint.cpp
+++ b/core/jni/android/graphics/Paint.cpp
@@ -823,7 +823,7 @@
     static jfloat doRunAdvance(const Paint* paint, Typeface* typeface, const jchar buf[],
             jint start, jint count, jint bufSize, jboolean isRtl, jint offset) {
         int bidiFlags = isRtl ? kBidi_Force_RTL : kBidi_Force_LTR;
-        if (offset == count) {
+        if (offset == start + count) {
             return MinikinUtils::measureText(paint, bidiFlags, typeface, buf, start, count,
                     bufSize, nullptr);
         }