From 7871f4953ac073018fc459d3fd8b4d035454a093 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Wed, 22 Jan 2020 11:57:19 -0500 Subject: [PATCH] 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 --- core/jni/android/graphics/apex/android_bitmap.cpp | 6 +++--- .../android/graphics/apex/include/android/graphics/bitmap.h | 2 +- native/graphics/jni/bitmap.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/jni/android/graphics/apex/android_bitmap.cpp b/core/jni/android/graphics/apex/android_bitmap.cpp index 789d02978c241..66285292743bb 100644 --- a/core/jni/android/graphics/apex/android_bitmap.cpp +++ b/core/jni/android/graphics/apex/android_bitmap.cpp @@ -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: diff --git a/core/jni/android/graphics/apex/include/android/graphics/bitmap.h b/core/jni/android/graphics/apex/include/android/graphics/bitmap.h index 02ec6554f522f..45fec2ab7b43f 100644 --- a/core/jni/android/graphics/apex/include/android/graphics/bitmap.h +++ b/core/jni/android/graphics/apex/include/android/graphics/bitmap.h @@ -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. * diff --git a/native/graphics/jni/bitmap.cpp b/native/graphics/jni/bitmap.cpp index 4f21ccba2419d..3d0fd254f9a82 100644 --- a/native/graphics/jni/bitmap.cpp +++ b/native/graphics/jni/bitmap.cpp @@ -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; }