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

Commit b9312a54 authored by Digish Pandya's avatar Digish Pandya
Browse files

Correct stride for drawing to cached glyph bitmap 



fixes the glyph cachebuffer index to account for pixelbuffer
format size.

issue: in launcher home screen create icon group and rename the
group to some text string with emo-icons (smilies). without this
change the drop shadows for emo-icons will look bad.

Change-Id: I525a9219d35f4541363fd64e7fc5fd1053269725
Signed-off-by: default avatarDigish Pandya <digishp@codeaurora.org>
parent 678f7edd

libs/hwui/font/Font.cpp

+15 −5
Original line number Diff line number Diff line
@@ -212,19 +212,29 @@ void Font::drawCachedGlyphBitmap(CachedGlyphInfo* glyph, int x, int y, uint8_t* 
    int dstY = y + glyph->mBitmapTop;



    CacheTexture* cacheTexture = glyph->mCacheTexture;

    PixelBuffer* pixelBuffer = cacheTexture->getPixelBuffer();



    uint32_t formatSize = PixelBuffer::formatSize(pixelBuffer->getFormat());

    uint32_t cacheWidth = cacheTexture->getWidth();

    uint32_t startY = glyph->mStartY * cacheWidth;

    uint32_t endY = startY + (glyph->mBitmapHeight * cacheWidth);

    uint32_t srcStride = formatSize * cacheWidth;

    uint32_t startY = glyph->mStartY * srcStride;

    uint32_t endY = startY + (glyph->mBitmapHeight * srcStride);



    PixelBuffer* pixelBuffer = cacheTexture->getPixelBuffer();

    const uint8_t* cacheBuffer = pixelBuffer->map();



    for (uint32_t cacheY = startY, bitmapY = dstY * bitmapWidth; cacheY < endY;

            cacheY += cacheWidth, bitmapY += bitmapWidth) {

            cacheY += srcStride, bitmapY += bitmapWidth) {



        if (formatSize == 1) {

            memcpy(&bitmap[bitmapY + dstX], &cacheBuffer[cacheY + glyph->mStartX], glyph->mBitmapWidth);

        } else {

            for (uint32_t i = 0; i < glyph->mBitmapWidth; ++i) {

                bitmap[bitmapY + dstX + i] = cacheBuffer[cacheY + (glyph->mStartX + i)*formatSize];

            }

        }

    }



}



void Font::drawCachedGlyph(CachedGlyphInfo* glyph, float x, float hOffset, float vOffset,

        SkPathMeasure& measure, SkPoint* position, SkVector* tangent) {