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

Commit 7a6dca42 authored by Keun young Park's avatar Keun young Park Committed by Android Git Automerger
Browse files

am 09ff8a6f: am 27665148: am c378656d: Merge "fix wrong read size in... 

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

* commit '09ff8a6f':
  fix wrong read size in ToColor_S4444_Opaque
parents 0ce39762 09ff8a6f

core/jni/android/graphics/Bitmap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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,

                                 SkColorTable*) {

    SkASSERT(width > 0);

    const SkPMColor* s = (const SkPMColor*)src;

    const SkPMColor16* s = (const SkPMColor16*)src;

    do {

        SkPMColor c = SkPixel4444ToPixel32(*s++);

        *dst++ = SkColorSetRGB(SkGetPackedR32(c), SkGetPackedG32(c),