diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-12-02 15:56:19 -0800 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2011-12-02 15:56:19 -0800 |
| commit | 5448f0378ede9c5d33e7300fa318ef4a6925562f (patch) | |
| tree | 56a2e66e6ec97d62cb591faa8969a3a2cfb4395a /core/jni/android | |
| parent | a90d65265fe94e35967876500105d6e020ce0f91 (diff) | |
| download | frameworks_base-5448f0378ede9c5d33e7300fa318ef4a6925562f.zip frameworks_base-5448f0378ede9c5d33e7300fa318ef4a6925562f.tar.gz frameworks_base-5448f0378ede9c5d33e7300fa318ef4a6925562f.tar.bz2 | |
TextLayoutCache Fix compilation issue
- fix compilation after refactoring and when setting DEBUG_ADVANCES to 1
Change-Id: I8eef7e3c4550c505325459948d3c8eebbdd5215a
Diffstat (limited to 'core/jni/android')
| -rw-r--r-- | core/jni/android/graphics/TextLayoutCache.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index b089466..675cf33 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -368,7 +368,7 @@ void TextLayoutEngine::computeValues(TextLayoutCacheValue* value, SkPaint* paint &value->mAdvances, &value->mTotalAdvance, &value->mGlyphs); #if DEBUG_ADVANCES LOGD("Advances - start = %d, count = %d, contextCount = %d, totalAdvance = %f", start, count, - contextCount, mTotalAdvance); + contextCount, value->mTotalAdvance); #endif } @@ -602,13 +602,14 @@ void TextLayoutEngine::computeRunValues(SkPaint* paint, const UChar* chars, outAdvances->add(currentAdvance); } } + totalAdvance += totalFontRunAdvance; #if DEBUG_ADVANCES LOGD("Returned advances"); for (size_t i = 0; i < countScriptRun; i++) { LOGD(" -- hb-adv[%d] = %f, log_clusters = %d, total = %f", i, - (*outAdvances)[i], shaperItem.log_clusters[i], totalFontRunAdvance); + (*outAdvances)[i], mShaperItem.log_clusters[i], totalFontRunAdvance); } #endif @@ -628,7 +629,9 @@ void TextLayoutEngine::computeRunValues(SkPaint* paint, const UChar* chars, } } } + *outTotalAdvance = totalAdvance; + #if DEBUG_GLYPHS LOGD("-------- End of Script Run --------"); #endif |