summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2014-05-29 21:27:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-29 21:27:39 +0000
commit7d190a2b771c37b6e3d45265e3a40019067813a6 (patch)
tree4909ef8a6477d86895b648ef29e09976d6d87695
parentfb9c6e2e4e82c1eadfa9d560b4aa79b5f3fbe863 (diff)
parent0297ee985c26b49fc2a3b0941db354c27f436bbf (diff)
downloadandroid_frameworks_minikin-7d190a2b771c37b6e3d45265e3a40019067813a6.tar.gz
android_frameworks_minikin-7d190a2b771c37b6e3d45265e3a40019067813a6.tar.bz2
android_frameworks_minikin-7d190a2b771c37b6e3d45265e3a40019067813a6.zip
am 0297ee98: Fix for Minikin native crash
* commit '0297ee985c26b49fc2a3b0941db354c27f436bbf': Fix for Minikin native crash
-rw-r--r--libs/minikin/Layout.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp
index 3935eb7..aba8a1c 100644
--- a/libs/minikin/Layout.cpp
+++ b/libs/minikin/Layout.cpp
@@ -661,7 +661,7 @@ void Layout::doLayoutRun(const uint16_t* buf, size_t start, size_t count, size_t
ctx->paint.font->GetBounds(&glyphBounds, glyph_ix, ctx->paint);
glyphBounds.offset(x + xoff, y + yoff);
mBounds.join(glyphBounds);
- size_t cluster = info[i].cluster;
+ size_t cluster = info[i].cluster - start;
mAdvances[cluster] += xAdvance;
x += xAdvance;
}