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

am: 5c7f79f

* commit '5c7f79fc2ececca2e0ae3578d86eba3dbe824072':
  Fix: doRunAdvance returns wrong value when offset == count.

Change-Id: I6a165a53f81533931dbd64330705a05b68d2852f
This commit is contained in:
Keisuke Kuroyanagi
2016-04-01 05:36:00 +00:00
committed by android-build-merger

View File

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