Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: aea43f8

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

Change-Id: Idc138c0f289de33d44cb9722257ba7334208e516
This commit is contained in:
Keisuke Kuroyanagi
2016-04-01 05:31:33 +00:00
committed by android-build-merger
parent 1ccc4e1479 aea43f8414
commit 5c7f79fc2e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -823,7 +823,7 @@ namespace PaintGlue {
static jfloat doRunAdvance(const Paint* paint, Typeface* typeface, const jchar buf[], static jfloat doRunAdvance(const Paint* paint, Typeface* typeface, const jchar buf[],
jint start, jint count, jint bufSize, jboolean isRtl, jint offset) { jint start, jint count, jint bufSize, jboolean isRtl, jint offset) {
int bidiFlags = isRtl ? kBidi_Force_RTL : kBidi_Force_LTR; 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, return MinikinUtils::measureText(paint, bidiFlags, typeface, buf, start, count,
bufSize, nullptr); bufSize, nullptr);
} }