Merge "Rename AndroidBitmap_compress callback" (fa75a86d) · Commits · e / os / android_frameworks_base

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:

+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.
		*

+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;
		}