diff options
| author | Raph Levien <raph@google.com> | 2014-05-24 14:52:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-24 14:52:56 +0000 |
| commit | 9d44749a5da41289c22b902ccec02a8f0668ccbf (patch) | |
| tree | cdfd772d61a6eb71d7268f5d278e82202a247769 | |
| parent | 0980c41b387cd2ae253501530586a207761f151f (diff) | |
| parent | 72fe9422c869b7878240a23e4650d9d90edb1c2a (diff) | |
| download | android_frameworks_minikin-9d44749a5da41289c22b902ccec02a8f0668ccbf.tar.gz android_frameworks_minikin-9d44749a5da41289c22b902ccec02a8f0668ccbf.tar.bz2 android_frameworks_minikin-9d44749a5da41289c22b902ccec02a8f0668ccbf.zip | |
am 72fe9422: Fix native crash in Latin-1 typefaces
* commit '72fe9422c869b7878240a23e4650d9d90edb1c2a':
Fix native crash in Latin-1 typefaces
| -rw-r--r-- | libs/minikin/FontCollection.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/minikin/FontCollection.cpp b/libs/minikin/FontCollection.cpp index 67089db..e6ff117 100644 --- a/libs/minikin/FontCollection.cpp +++ b/libs/minikin/FontCollection.cpp @@ -75,7 +75,7 @@ FontCollection::FontCollection(const vector<FontFamily*>& typefaces) : mMaxChar = max(mMaxChar, instance->mCoverage->length()); lastChar.push_back(instance->mCoverage->nextSetBit(0)); } - size_t nPages = mMaxChar >> kLogCharsPerPage; + size_t nPages = (mMaxChar + kPageMask) >> kLogCharsPerPage; size_t offset = 0; for (size_t i = 0; i < nPages; i++) { Range dummy; |