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

2016-04-01 05:27:35 +00:00
parent c1b8e88329 b3677715e6
commit aea43f8414
1 changed files with 1 additions and 1 deletions
--- a/core/jni/android/graphics/Paint.cpp
+++ b/core/jni/android/graphics/Paint.cpp
@@ -823,7 +823,7 @@ namespace PaintGlue {
    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);
        }