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

Commit afb4b1b2 authored by Digish Pandya's avatar Digish Pandya Committed by Steve Kondik
Browse files

Correct the bitmap copy to preserve already drawn area 

this fixes the issue of missing black background for some gylphs and
making it looks bright as only white forground part is drawn when
some regional fonts are selected like HINDI

b/19062769 Text colour is not proper for some characters
Change-Id: If887d0270befc8803b26be6fb492836cc6ed0137
parent 20e8d638

libs/hwui/font/Font.cpp

+2 −8
Original line number Diff line number Diff line
@@ -228,18 +228,12 @@ void Font::drawCachedGlyphBitmap(CachedGlyphInfo* glyph, int x, int y, uint8_t* 


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

            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 + alpha_channel_offset];

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

        }

    }

}



}



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

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

    const float halfWidth = glyph->mBitmapWidth * 0.5f;