diff options
| author | Keun young Park <keunyoung@google.com> | 2012-10-12 13:45:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-12 13:45:46 -0700 |
| commit | 09ff8a6f43dad1e27524e41622392fe040b7bdab (patch) | |
| tree | be59349e4029cb75ecbfb690b2a58f78c4d131f9 /core/jni | |
| parent | 204eadc687280d558dd99b7c37c32f988c1cc229 (diff) | |
| parent | 27665148cb72cbc7d4d5941f97ae54a73fa58d3c (diff) | |
| download | frameworks_base-09ff8a6f43dad1e27524e41622392fe040b7bdab.zip frameworks_base-09ff8a6f43dad1e27524e41622392fe040b7bdab.tar.gz frameworks_base-09ff8a6f43dad1e27524e41622392fe040b7bdab.tar.bz2 | |
am 27665148: am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev
* commit '27665148cb72cbc7d4d5941f97ae54a73fa58d3c':
fix wrong read size in ToColor_S4444_Opaque
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android/graphics/Bitmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 1bba5b4..fd7a6a7 100644 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -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),
|