Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Saturate alpha values when overlaying glyphs" into mnc-dev

Browse Source
This commit is contained in:
Chris Craik
2015-06-30 20:52:24 +00:00
committed by Android (Google) Code Review
parent 89575b678c de25a672b1
commit a763bb83cf
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/hwui/font/Font.cpp
View File

@@ -228,15 +228,15 @@ void Font::drawCachedGlyphBitmap(CachedGlyphInfo* glyph, int x, int y, uint8_t*
for (uint32_t cacheY = startY, bitmapY = dstY * bitmapWidth; cacheY < endY; for (uint32_t cacheY = startY, bitmapY = dstY * bitmapWidth; cacheY < endY;
cacheY += srcStride, bitmapY += bitmapWidth) { cacheY += srcStride, bitmapY += bitmapWidth) {
if (formatSize == 1) { for (uint32_t i = 0; i < glyph->mBitmapWidth; ++i) {
memcpy(&bitmap[bitmapY + dstX], &cacheBuffer[cacheY + glyph->mStartX], glyph->mBitmapWidth); uint8_t* dst = &(bitmap[bitmapY + dstX + i]);
} else { const uint8_t& src = cacheBuffer[
for (uint32_t i = 0; i < glyph->mBitmapWidth; ++i) { cacheY + (glyph->mStartX + i)*formatSize + alpha_channel_offset];
bitmap[bitmapY + dstX + i] = cacheBuffer[cacheY + (glyph->mStartX + i)*formatSize + alpha_channel_offset]; // Add alpha values to a max of 255, full opacity. This is done to handle
} // fonts/strings where glyphs overlap.
*dst = std::min(*dst + src, 255);
} }
} }
} }
void Font::drawCachedGlyph(CachedGlyphInfo* glyph, float x, float hOffset, float vOffset, void Font::drawCachedGlyph(CachedGlyphInfo* glyph, float x, float hOffset, float vOffset,