am 3ed72781: Convert 4444 bitmaps to 8888 Bug #10206452 (2a9195d5) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/Bitmap.cpp

+6 −3

Original line number	Diff line number	Diff line
		@@ -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);