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

Commit 7871f495 authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

Rename AndroidBitmap_compress callback 

Bug: 135133301
Test: No change in behavior, no new tests

Along with Id5d039761054cf8e7fb906624a277714c21156de, which does the
rename in the header, this does the rename in the impl.

Change-Id: I27244df241a8141b0fd39e02e778eef2975f4dc0
parent 563a7b08

core/jni/android/graphics/apex/android_bitmap.cpp

+3 −3
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ SkAlphaType getAlphaType(const AndroidBitmapInfo* info) { 


class CompressWriter : public SkWStream {

public:

    CompressWriter(void* userContext, AndroidBitmap_compress_write_fn fn)

    CompressWriter(void* userContext, AndroidBitmap_CompressWriteFunc fn)

          : mUserContext(userContext), mFn(fn), mBytesWritten(0) {}



    bool write(const void* buffer, size_t size) override {
@@ -199,7 +199,7 @@ public: 


private:

    void* mUserContext;

    AndroidBitmap_compress_write_fn mFn;

    AndroidBitmap_CompressWriteFunc mFn;

    size_t mBytesWritten;

};
@@ -207,7 +207,7 @@ private: 


int ABitmap_compress(const AndroidBitmapInfo* info, ADataSpace dataSpace, const void* pixels,

                     AndroidBitmapCompressFormat inFormat, int32_t quality, void* userContext,

                     AndroidBitmap_compress_write_fn fn) {

                     AndroidBitmap_CompressWriteFunc fn) {

    Bitmap::JavaCompressFormat format;

    switch (inFormat) {

        case ANDROID_BITMAP_COMPRESS_FORMAT_JPEG:

core/jni/android/graphics/apex/include/android/graphics/bitmap.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ jobject ABitmapConfig_getConfigFromFormat(JNIEnv* env, AndroidBitmapFormat forma 
// NDK access

int ABitmap_compress(const AndroidBitmapInfo* info, ADataSpace dataSpace, const void* pixels,

                     AndroidBitmapCompressFormat format, int32_t quality, void* userContext,

                     AndroidBitmap_compress_write_fn);

                     AndroidBitmap_CompressWriteFunc);

/**

 *  Retrieve the native object associated with a HARDWARE Bitmap.

 *

native/graphics/jni/bitmap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int AndroidBitmap_compress(const AndroidBitmapInfo* info, 
                           const void* pixels,

                           int32_t format, int32_t quality,

                           void* userContext,

                           AndroidBitmap_compress_write_fn fn) {

                           AndroidBitmap_CompressWriteFunc fn) {

    if (NULL == info || NULL == pixels || NULL == fn) {

        return ANDROID_BITMAP_RESULT_BAD_PARAMETER;

    }