diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-11 17:48:08 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-11 17:48:09 -0700 |
| commit | 5c09d605678d64e05579bb668b615764a714f1f7 (patch) | |
| tree | 1c93dc2bc74ca485d34b87b2712fce3223050446 | |
| parent | 2415841c370d855d7f3a3e6a537e641c69a57097 (diff) | |
| parent | ee309635d23fa6a9b17be7b1d85dcb8ad065d6c8 (diff) | |
| download | base-5c09d605678d64e05579bb668b615764a714f1f7.tar.gz | |
Merge "Fix CacheBitmap crash issue when using H/W UI rendering"
| -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; |