diff options
| author | Raph Levien <raph@google.com> | 2014-05-14 12:33:09 -0700 |
|---|---|---|
| committer | Raph Levien <raph@google.com> | 2014-05-14 12:33:09 -0700 |
| commit | 0a689bb956183beebe7d59fccb226a82680f265a (patch) | |
| tree | 675aeaf4780539ab6902f349bd9b22a361c4e219 | |
| parent | d133eab2a1a59ce4a5b1b3db04ec00dc0dbdf349 (diff) | |
| download | android_frameworks_minikin-0a689bb956183beebe7d59fccb226a82680f265a.tar.gz android_frameworks_minikin-0a689bb956183beebe7d59fccb226a82680f265a.tar.bz2 android_frameworks_minikin-0a689bb956183beebe7d59fccb226a82680f265a.zip | |
Fix 64-bit cleanliness problem
This patch fixes a problem where int and ssize_t were being conflated.
Change-Id: I642a4ee1d59d81723034fdfe33bd8ca29a5dc322
| -rw-r--r-- | libs/minikin/Layout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp index 20e2d9e..08365b3 100644 --- a/libs/minikin/Layout.cpp +++ b/libs/minikin/Layout.cpp @@ -315,8 +315,8 @@ void Layout::doLayout(const uint16_t* buf, size_t nchars) { hb_font_set_ppem(hbFont, size, size); hb_font_set_scale(hbFont, HBFloatToFixed(size), HBFloatToFixed(size)); - int srunend; - for (int srunstart = run.start; srunstart < run.end; srunstart = srunend) { + ssize_t srunend; + for (ssize_t srunstart = run.start; srunstart < run.end; srunstart = srunend) { srunend = srunstart; hb_script_t script = getScriptRun(buf, run.end, &srunend); |