AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

restore bitmap.erase() support for 4444 : trivial, and BitmapCopyTest relied on it

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@9731 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2013-06-21 19:51:31 +00:00
parent 2b9424b342
commit 45f746f521
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/SkBitmap.cpp
View File

@ -748,6 +748,14 @@ bool SkBitmap::ComputeIsOpaque(const SkBitmap& bm) {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
static uint16_t pack_8888_to_4444(unsigned a, unsigned r, unsigned g, unsigned b) {
unsigned pixel = (SkA32To4444(a) << SK_A4444_SHIFT) |
(SkR32To4444(r) << SK_R4444_SHIFT) |
(SkG32To4444(g) << SK_G4444_SHIFT) |
(SkB32To4444(b) << SK_B4444_SHIFT);
return SkToU16(pixel);
}
void SkBitmap::eraseARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) const { void SkBitmap::eraseARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) const {
SkDEBUGCODE(this->validate();) SkDEBUGCODE(this->validate();)
@ -793,11 +801,18 @@ void SkBitmap::eraseARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) const {
} }
break; break;
} }
case kARGB_4444_Config:
case kRGB_565_Config: { case kRGB_565_Config: {
uint16_t* p = (uint16_t*)fPixels; uint16_t* p = (uint16_t*)fPixels;
uint16_t v = SkPackRGB16(r >> (8 - SK_R16_BITS), uint16_t v;
g >> (8 - SK_G16_BITS),
b >> (8 - SK_B16_BITS)); if (kARGB_4444_Config == fConfig) {
v = pack_8888_to_4444(a, r, g, b);
} else {
v = SkPackRGB16(r >> (8 - SK_R16_BITS),
g >> (8 - SK_G16_BITS),
b >> (8 - SK_B16_BITS));
}
while (--height >= 0) { while (--height >= 0) {
sk_memset16(p, v, width); sk_memset16(p, v, width);
p = (uint16_t*)((char*)p + rowBytes); p = (uint16_t*)((char*)p + rowBytes);