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

am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

Browse Source 
* commit '520a5c5670ef5c01dc73d4bfa46372414b2b85aa':
  Fix bitmap get/set pixels for ALPHA_8
This commit is contained in:
Chris Craik
2015-07-27 18:18:58 +00:00
committed by Android Git Automerger
parent 5821d548c6 520a5c5670
commit 53a82e3585
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/jni/android/graphics/Bitmap.cpp
View File

@@ -475,6 +475,14 @@ static void FromColor_D4444_Raw(void* dst, const SkColor src[], int width,
}
}
static void FromColor_DA8(void* dst, const SkColor src[], int width, int x, int y) {
uint8_t* d = (uint8_t*)dst;
for (int stop = x + width; x < stop; x++) {
*d++ = SkColorGetA(*src++);
}
}
// can return NULL
static FromColorProc ChooseFromColorProc(const SkBitmap& bitmap) {
switch (bitmap.colorType()) {
@@ -485,6 +493,8 @@ static FromColorProc ChooseFromColorProc(const SkBitmap& bitmap) {
FromColor_D4444_Raw;
case kRGB_565_SkColorType:
return FromColor_D565;
case kAlpha_8_SkColorType:
return FromColor_DA8;
default:
break;
}
@@ -632,6 +642,15 @@ static void ToColor_SI8_Opaque(SkColor dst[], const void* src, int width,
} while (--width != 0);
}
static void ToColor_SA8(SkColor dst[], const void* src, int width, SkColorTable*) {
SkASSERT(width > 0);
const uint8_t* s = (const uint8_t*)src;
do {
uint8_t c = *s++;
*dst++ = SkColorSetARGB(c, c, c, c);
} while (--width != 0);
}
// can return NULL
static ToColorProc ChooseToColorProc(const SkBitmap& src) {
switch (src.colorType()) {
@@ -673,6 +692,8 @@ static ToColorProc ChooseToColorProc(const SkBitmap& src) {
default:
return NULL;
}
case kAlpha_8_SkColorType:
return ToColor_SA8;
default:
break;
}