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

Merge "Fix potential issue with the TextLayoutCache with glyphs"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2011-10-03 09:56:39 -07:00
committed by Android (Google) Code Review
parent eb3b750c1d 155fa38a71
commit 8ebf1efd66
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android/graphics/TextLayoutCache.cpp
View File

@@ -626,7 +626,9 @@ void TextLayoutCacheValue::getGlyphsIndexAndCount(size_t start, size_t count, si
return; return;
} }
*outStartIndex = mLogClusters[start]; *outStartIndex = mLogClusters[start];
*outGlyphsCount = mLogClusters[start + count - 1] - mLogClusters[start] + 1; size_t endIndex = (start + count >= mAdvances.size()) ?
mGlyphs.size() : mLogClusters[start + count];
*outGlyphsCount = endIndex - *outStartIndex;
#if DEBUG_GLYPHS #if DEBUG_GLYPHS
LOGD("getGlyphsIndexes - start=%d count=%d - startIndex=%d count=%d", start, count, LOGD("getGlyphsIndexes - start=%d count=%d - startIndex=%d count=%d", start, count,
*outStartIndex, *outGlyphsCount); *outStartIndex, *outGlyphsCount);