Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 503b0cc3 authored by Chet Haase's avatar Chet Haase Committed by Android Git Automerger
Browse files

am 0784c870: am 998ca230: Merge "Fix glyph cropping bug" into jb-mr1-dev 

* commit '0784c870':
  Fix glyph cropping bug
parents 56f4a672 0784c870

libs/hwui/FontRenderer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ bool CacheTexture::fitBitmap(const SkGlyph& glyph, uint32_t *retOriginX, uint32_ 
                cacheBlock->mX += roundedUpW;

                if (mHeight - glyphH >= glyphH) {

                    // There's enough height left over to create a new CacheBlock

                    CacheBlock *newBlock = new CacheBlock(oldX, glyphH, roundedUpW,

                            mHeight - glyphH);

                    CacheBlock *newBlock = new CacheBlock(oldX, glyphH + TEXTURE_BORDER_SIZE,

                            roundedUpW, mHeight - glyphH - TEXTURE_BORDER_SIZE);

#if DEBUG_FONT_RENDERER

                    ALOGD("fitBitmap: Created new block: this, x, y, w, h = %p, %d, %d, %d, %d",

                            newBlock, newBlock->mX, newBlock->mY,