diff options
author | Raph Levien <raph@google.com> | 2015-06-01 21:31:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-01 21:33:48 +0000 |
commit | 73fa6dfd6366c6ac04d6a25cdcc0721f5b3e7fbb (patch) | |
tree | 4918b37e322620bfebe8e624c271ed9b1e73bd66 | |
parent | a019665898d830283a99f505f72d3899ba137b62 (diff) | |
parent | 95af01c57b60130ba4c098340ba6ea4b4ebfee3f (diff) | |
download | android_frameworks_minikin-73fa6dfd6366c6ac04d6a25cdcc0721f5b3e7fbb.tar.gz android_frameworks_minikin-73fa6dfd6366c6ac04d6a25cdcc0721f5b3e7fbb.tar.bz2 android_frameworks_minikin-73fa6dfd6366c6ac04d6a25cdcc0721f5b3e7fbb.zip |
Merge "Use context start correctly in getRunAdvance" into mnc-dev
-rw-r--r-- | libs/minikin/Measurement.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/minikin/Measurement.cpp b/libs/minikin/Measurement.cpp index 21df5d8..98d2c01 100644 --- a/libs/minikin/Measurement.cpp +++ b/libs/minikin/Measurement.cpp @@ -41,7 +41,7 @@ float getRunAdvance(Layout& layout, const uint16_t* buf, size_t start, size_t co clusterWidth = charAdvance; } } - if (offset < start + count && layout.getCharAdvance(offset) == 0.0f) { + if (offset < start + count && layout.getCharAdvance(offset - start) == 0.0f) { // In the middle of a cluster, distribute width of cluster so that each grapheme cluster // gets an equal share. // TODO: get caret information out of font when that's available |