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

Merge "Fix bug #5174495 Harfbuzz shaping is broken after taking care of Indic"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2011-08-16 17:35:06 -07:00
committed by Android (Google) Code Review
parent 755bd67a50 5960723061
commit c5f7a851b3
1 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -360,31 +360,7 @@ void TextLayoutCacheValue::setupShaperItem(HB_ShaperItem* shaperItem, HB_FontRec
shaperItem->item.length = count;
shaperItem->item.bidiLevel = isRTL;
ssize_t nextCodePoint = 0;
uint32_t codePoint = utf16_to_code_point(chars, count, &nextCodePoint);
HB_Script script = code_point_to_script(codePoint);
if (script == HB_Script_Inherited) {
#if DEBUG_GLYPHS
LOGD("Cannot find a correct script for code point=%d "
" Need to look at the next code points.", codePoint);
#endif
while (script == HB_Script_Inherited && nextCodePoint < count) {
codePoint = utf16_to_code_point(chars, count, &nextCodePoint);
script = code_point_to_script(codePoint);
}
}
if (script == HB_Script_Inherited) {
#if DEBUG_GLYPHS
LOGD("Cannot find a correct script from the text."
" Need to select a default script depending on the passed text direction.");
#endif
script = isRTL ? HB_Script_Arabic : HB_Script_Common;
}
shaperItem->item.script = script;
shaperItem->item.script = isRTL ? HB_Script_Arabic : HB_Script_Common;
shaperItem->string = chars;
shaperItem->stringLength = contextCount;