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

Merge "Add WEBP to the list of Image formats that support Compression."

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2011-06-24 11:13:42 -07:00
committed by Android Code Review
parent f458d5fdb8 2305ac9e4a
commit 4fea5373d3
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,7 +261,8 @@ static void Bitmap_recycle(JNIEnv* env, jobject, SkBitmap* bitmap) {
// These must match the int values in Bitmap.java // These must match the int values in Bitmap.java
enum JavaEncodeFormat { enum JavaEncodeFormat {
kJPEG_JavaEncodeFormat = 0, kJPEG_JavaEncodeFormat = 0,
kPNG_JavaEncodeFormat = 1 kPNG_JavaEncodeFormat = 1,
kWEBP_JavaEncodeFormat = 2
}; };
static bool Bitmap_compress(JNIEnv* env, jobject clazz, SkBitmap* bitmap, static bool Bitmap_compress(JNIEnv* env, jobject clazz, SkBitmap* bitmap,
@@ -276,6 +277,9 @@ static bool Bitmap_compress(JNIEnv* env, jobject clazz, SkBitmap* bitmap,
case kPNG_JavaEncodeFormat: case kPNG_JavaEncodeFormat:
fm = SkImageEncoder::kPNG_Type; fm = SkImageEncoder::kPNG_Type;
break; break;
case kWEBP_JavaEncodeFormat:
fm = SkImageEncoder::kWEBP_Type;
break;
default: default:
return false; return false;
} }
@@ -626,4 +630,3 @@ int register_android_graphics_Bitmap(JNIEnv* env)
return android::AndroidRuntime::registerNativeMethods(env, kClassPathName, return android::AndroidRuntime::registerNativeMethods(env, kClassPathName,
gBitmapMethods, SK_ARRAY_COUNT(gBitmapMethods)); gBitmapMethods, SK_ARRAY_COUNT(gBitmapMethods));
} }

3
graphics/java/android/graphics/Bitmap.java
View File

@@ -546,7 +546,8 @@ public final class Bitmap implements Parcelable {
*/ */
public enum CompressFormat { public enum CompressFormat {
JPEG (0), JPEG (0),
PNG (1); PNG (1),
WEBP (2);
CompressFormat(int nativeInt) { CompressFormat(int nativeInt) {
this.nativeInt = nativeInt; this.nativeInt = nativeInt;