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

Commit 2305ac9e authored by Vikas Arora's avatar Vikas Arora
Browse files

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

Note: The integrator of this change to Android internal code-repo will
have to run one extra step 'make update-api' to update 'api/current.txt'
file corresponding to approved API. The AOSP branch didn't have this
file, hence I could not add the same to this change. The updated file
'api/current.txt' has to be submitted along with this change.

Change-Id: I29909e907a2e82d801e16654322190a808c5bda9
parent e2b41b0d

core/jni/android/graphics/Bitmap.cpp

+5 −2
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;

    }
@@ -626,4 +630,3 @@ int register_android_graphics_Bitmap(JNIEnv* env) 
    return android::AndroidRuntime::registerNativeMethods(env, kClassPathName,

                                gBitmapMethods, SK_ARRAY_COUNT(gBitmapMethods));

}

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;