diff options
| author | 2012-09-11 17:57:19 -0700 | |
|---|---|---|
| committer | 2012-09-11 17:57:19 -0700 | |
| commit | 70a5967e0bb295f64c99593043f138fdd62365f4 (patch) | |
| tree | bb7d0ef0a6e05672303b91caaf574f75824d92d6 /libs/hwui/FontRenderer.cpp | |
| parent | 65208857d35efe39c1dbc1da23f2caf7257232fc (diff) | |
| parent | 5c09d605678d64e05579bb668b615764a714f1f7 (diff) | |
am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"
* commit '5c09d605678d64e05579bb668b615764a714f1f7':
Fix CacheBitmap crash issue when using H/W UI rendering
Diffstat (limited to 'libs/hwui/FontRenderer.cpp')
| -rw-r--r-- | libs/hwui/FontRenderer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp index 5fdbc11d0e5e..b51b1e11b929 100644 --- a/libs/hwui/FontRenderer.cpp +++ b/libs/hwui/FontRenderer.cpp @@ -617,7 +617,7 @@ void FontRenderer::cacheBitmap(const SkGlyph& glyph, CachedGlyphInfo* cachedGlyp uint32_t* retOriginX, uint32_t* retOriginY) { cachedGlyph->mIsValid = false; // 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", (int) glyph.fWidth, (int) glyph.fHeight); return; |