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

Merge "Fix bug # 5376028 Arabic text is kinda broken - disappearing glyphs"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2011-09-27 18:45:57 -07:00
committed by Android (Google) Code Review
parent 25438e2199 5293cea4e0
commit 8f0bb4bc17
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -551,8 +551,7 @@ void TextLayoutCacheValue::computeRunValuesWithHarfbuzz(SkPaint* paint, const UC
// Get LogClusters // Get LogClusters
if (outLogClusters) { if (outLogClusters) {
size_t countLogClusters = outLogClusters->size(); size_t countLogClusters = outLogClusters->size();
size_t countGlyphs = shaperItem.num_glyphs; for (size_t i = 0; i < count; i++) {
for (size_t i = 0; i < countGlyphs; i++) {
// As there may be successive runs, we need to shift the log clusters // As there may be successive runs, we need to shift the log clusters
unsigned short logCluster = shaperItem.log_clusters[i] + countLogClusters; unsigned short logCluster = shaperItem.log_clusters[i] + countLogClusters;
#if DEBUG_GLYPHS #if DEBUG_GLYPHS
@@ -620,25 +619,15 @@ void TextLayoutCacheValue::getGlyphsIndexAndCount(size_t start, size_t count, si
*outGlyphsCount = 0; *outGlyphsCount = 0;
return; return;
} }
size_t endIndex = 0; *outStartIndex = mLogClusters[start];
for(size_t i = 0; i < mGlyphs.size(); i++) { *outGlyphsCount = mLogClusters[start + count - 1] - mLogClusters[start] + 1;
if (mLogClusters[i] <= start) {
*outStartIndex = i;
endIndex = i;
continue;
}
if (mLogClusters[i] <= start + count) {
endIndex = i;
}
}
*outGlyphsCount = endIndex - *outStartIndex + 1;
#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);
for(size_t i = 0; i < mGlyphs.size(); i++) { for(size_t i = 0; i < mGlyphs.size(); i++) {
LOGD("getGlyphs - all - glyph[%d] = %d", i, mGlyphs[i]); LOGD("getGlyphs - all - glyph[%d] = %d", i, mGlyphs[i]);
} }
for(size_t i = 0; i < mGlyphs.size(); i++) { for(size_t i = 0; i < mAdvances.size(); i++) {
LOGD("getGlyphs - all - logcl[%d] = %d", i, mLogClusters[i]); LOGD("getGlyphs - all - logcl[%d] = %d", i, mLogClusters[i]);
} }
#endif #endif