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

am 27665148: am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev

Browse Source 
* commit '27665148cb72cbc7d4d5941f97ae54a73fa58d3c':
  fix wrong read size in ToColor_S4444_Opaque
This commit is contained in:
Keun young Park
2012-10-12 13:45:46 -07:00
committed by Android Git Automerger
parent 204eadc687 27665148cb
commit 09ff8a6f43
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,7 +145,7 @@ static void ToColor_S4444_Alpha(SkColor dst[], const void* src, int width,
static void ToColor_S4444_Opaque(SkColor dst[], const void* src, int width, static void ToColor_S4444_Opaque(SkColor dst[], const void* src, int width,
SkColorTable*) { SkColorTable*) {
SkASSERT(width > 0); SkASSERT(width > 0);
const SkPMColor* s = (const SkPMColor*)src; const SkPMColor16* s = (const SkPMColor16*)src;
do { do {
SkPMColor c = SkPixel4444ToPixel32(*s++); SkPMColor c = SkPixel4444ToPixel32(*s++);
*dst++ = SkColorSetRGB(SkGetPackedR32(c), SkGetPackedG32(c), *dst++ = SkColorSetRGB(SkGetPackedR32(c), SkGetPackedG32(c),