Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88015caf authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

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

Merge "Add WEBP to the list of Image formats that support Compression. (by Vikas Arora)" into gingerbread
parents e4beb081 de04882c

core/jni/android/graphics/Bitmap.cpp

+5 −1
Original line number Diff line number Diff line
@@ -261,7 +261,8 @@ static void Bitmap_recycle(JNIEnv* env, jobject, SkBitmap* bitmap) { 
// These must match the int values in Bitmap.java

enum JavaEncodeFormat {

    kJPEG_JavaEncodeFormat = 0,

    kPNG_JavaEncodeFormat = 1

    kPNG_JavaEncodeFormat = 1,

    kWEBP_JavaEncodeFormat = 2

};



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:

        fm = SkImageEncoder::kPNG_Type;

        break;

    case kWEBP_JavaEncodeFormat:

        fm = SkImageEncoder::kWEBP_Type;

        break;

    default:

        return false;

    }

graphics/java/android/graphics/Bitmap.java

+2 −1
Original line number Diff line number Diff line
@@ -546,7 +546,8 @@ public final class Bitmap implements Parcelable { 
     */

    public enum CompressFormat {

        JPEG    (0),

        PNG     (1);

        PNG     (1),

        WEBP    (2);



        CompressFormat(int nativeInt) {

            this.nativeInt = nativeInt;