drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."

Browse Source 
* commit '99c070d8eb9f1ff9ea5c38991f15f091040226c2':
  Add WEBP to the list of Image formats that support Compression.
This commit is contained in:
Jean-Baptiste Queru
2011-06-24 12:20:24 -07:00
committed by Android Git Automerger
parent 9f1ef6d57b 99c070d8eb
commit ec5039b372
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,7 +271,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,
@ -286,6 +287,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;
} }

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

@ -681,7 +681,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;