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

am 3ed72781: Convert 4444 bitmaps to 8888 Bug #10206452

Browse Source 
* commit '3ed72781a0b155a88e52c8d295f50daab8cfb9ae':
  Convert 4444 bitmaps to 8888 Bug #10206452
This commit is contained in:
Romain Guy
2013-08-15 14:42:49 -07:00
committed by Android Git Automerger
parent db7f9f3842 3ed72781a0
commit 2a9195d53d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -222,8 +222,12 @@ static jobject Bitmap_creator(JNIEnv* env, jobject, jintArray jColors,
}
}
SkBitmap bitmap;
// ARGB_4444 is a deprecated format, convert automatically to 8888
if (config == SkBitmap::kARGB_4444_Config) {
config = SkBitmap::kARGB_8888_Config;
}
SkBitmap bitmap;
bitmap.setConfig(config, width, height);
jbyteArray buff = GraphicsJNI::allocateJavaPixelRef(env, &bitmap, NULL);
@@ -232,8 +236,7 @@ static jobject Bitmap_creator(JNIEnv* env, jobject, jintArray jColors,
}
if (jColors != NULL) {
GraphicsJNI::SetPixels(env, jColors, offset, stride,
0, 0, width, height, bitmap);
GraphicsJNI::SetPixels(env, jColors, offset, stride, 0, 0, width, height, bitmap);
}
return GraphicsJNI::createBitmap(env, new SkBitmap(bitmap), buff, isMutable, NULL, NULL);