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

am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"

Browse Source 
* commit '70a5967e0bb295f64c99593043f138fdd62365f4':
  Fix CacheBitmap crash issue when using H/W UI rendering
This commit is contained in:
Jean-Baptiste Queru
2012-09-11 17:59:14 -07:00
committed by Android Git Automerger
parent 91de90daad 70a5967e0b
commit c095eb04fa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/FontRenderer.cpp
View File

@@ -617,7 +617,7 @@ void FontRenderer::cacheBitmap(const SkGlyph& glyph, CachedGlyphInfo* cachedGlyp
uint32_t* retOriginX, uint32_t* retOriginY) { uint32_t* retOriginX, uint32_t* retOriginY) {
cachedGlyph->mIsValid = false; cachedGlyph->mIsValid = false;
// If the glyph is too tall, don't cache it // If the glyph is too tall, don't cache it
if (glyph.fHeight + TEXTURE_BORDER_SIZE > mCacheLines[mCacheLines.size() - 1]->mMaxHeight) { if (mCacheLines.size() != 0 && (glyph.fHeight + TEXTURE_BORDER_SIZE > mCacheLines[mCacheLines.size() - 1]->mMaxHeight)) {
ALOGE("Font size to large to fit in cache. width, height = %i, %i", ALOGE("Font size to large to fit in cache. width, height = %i, %i",
(int) glyph.fWidth, (int) glyph.fHeight); (int) glyph.fWidth, (int) glyph.fHeight);
return; return;