am ac487f70: am 6b849e21: Unhide BitmapRegionDecoder. (a23cdda0) · Commits · e / os / android_frameworks_base

api/current.xml

+140 −0

Original line number	Diff line number	Diff line
		@@ -72521,6 +72521,146 @@
		>
		</field>
		</class>
		<class name="BitmapRegionDecoder"
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="decodeRegion"
		return="android.graphics.Bitmap"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="rect" type="android.graphics.Rect">
		</parameter>
		<parameter name="options" type="android.graphics.BitmapFactory.Options">
		</parameter>
		</method>
		<method name="getHeight"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getWidth"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="isRecycled"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="newInstance"
		return="android.graphics.BitmapRegionDecoder"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="data" type="byte[]">
		</parameter>
		<parameter name="offset" type="int">
		</parameter>
		<parameter name="length" type="int">
		</parameter>
		<parameter name="isShareable" type="boolean">
		</parameter>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="newInstance"
		return="android.graphics.BitmapRegionDecoder"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="fd" type="java.io.FileDescriptor">
		</parameter>
		<parameter name="isShareable" type="boolean">
		</parameter>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="newInstance"
		return="android.graphics.BitmapRegionDecoder"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="is" type="java.io.InputStream">
		</parameter>
		<parameter name="isShareable" type="boolean">
		</parameter>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="newInstance"
		return="android.graphics.BitmapRegionDecoder"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="pathName" type="java.lang.String">
		</parameter>
		<parameter name="isShareable" type="boolean">
		</parameter>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="recycle"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		</class>
		<class name="BitmapShader"
		extends="android.graphics.Shader"
		abstract="false"

core/jni/Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -105,12 +105,13 @@ LOCAL_SRC_FILES:= \
		android_graphics_PixelFormat.cpp \
		android/graphics/Picture.cpp \
		android/graphics/PorterDuff.cpp \
		android/graphics/LargeBitmap.cpp \
		android/graphics/BitmapRegionDecoder.cpp \
		android/graphics/Rasterizer.cpp \
		android/graphics/Region.cpp \
		android/graphics/Shader.cpp \
		android/graphics/TextLayout.cpp \
		android/graphics/Typeface.cpp \
		android/graphics/Utils.cpp \
		android/graphics/Xfermode.cpp \
		android/graphics/YuvToJpegEncoder.cpp \
		android_media_AudioRecord.cpp \

core/jni/AndroidRuntime.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ extern int register_android_os_Binder(JNIEnv* env);
		extern int register_android_os_Process(JNIEnv* env);
		extern int register_android_graphics_Bitmap(JNIEnv*);
		extern int register_android_graphics_BitmapFactory(JNIEnv*);
		extern int register_android_graphics_LargeBitmap(JNIEnv*);
		extern int register_android_graphics_BitmapRegionDecoder(JNIEnv*);
		extern int register_android_graphics_Camera(JNIEnv* env);
		extern int register_android_graphics_Graphics(JNIEnv* env);
		extern int register_android_graphics_Interpolator(JNIEnv* env);
		@@ -1209,7 +1209,7 @@ static const RegJNIRec gRegJNI[] = {

		REG_JNI(register_android_graphics_Bitmap),
		REG_JNI(register_android_graphics_BitmapFactory),
		REG_JNI(register_android_graphics_LargeBitmap),
		REG_JNI(register_android_graphics_BitmapRegionDecoder),
		REG_JNI(register_android_graphics_Camera),
		REG_JNI(register_android_graphics_Canvas),
		REG_JNI(register_android_graphics_ColorFilter),

core/jni/android/graphics/BitmapFactory.cpp

+1 −222

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		#include "SkUtils.h"
		#include "CreateJavaOutputStreamAdaptor.h"
		#include "AutoDecodeCancel.h"
		#include "Utils.h"

		#include <android_runtime/AndroidRuntime.h>
		#include <utils/Asset.h>
		@@ -99,57 +100,6 @@ public:
		}
		};

		class AssetStreamAdaptor : public SkStream {
		public:
		AssetStreamAdaptor(Asset* a) : fAsset(a) {}

		virtual bool rewind() {
		off_t pos = fAsset->seek(0, SEEK_SET);
		if (pos == (off_t)-1) {
		SkDebugf("----- fAsset->seek(rewind) failed\n");
		return false;
		}
		return true;
		}

		virtual size_t read(void* buffer, size_t size) {
		ssize_t amount;

		if (NULL == buffer) {
		if (0 == size) { // caller is asking us for our total length
		return fAsset->getLength();
		}
		// asset->seek returns new total offset
		// we want to return amount that was skipped

		off_t oldOffset = fAsset->seek(0, SEEK_CUR);
		if (-1 == oldOffset) {
		SkDebugf("---- fAsset->seek(oldOffset) failed\n");
		return 0;
		}
		off_t newOffset = fAsset->seek(size, SEEK_CUR);
		if (-1 == newOffset) {
		SkDebugf("---- fAsset->seek(%d) failed\n", size);
		return 0;
		}
		amount = newOffset - oldOffset;
		} else {
		amount = fAsset->read(buffer, size);
		if (amount <= 0) {
		SkDebugf("---- fAsset->read(%d) returned %d\n", size, amount);
		}
		}

		if (amount < 0) {
		amount = 0;
		}
		return amount;
		}

		private:
		Asset* fAsset;
		};

		///////////////////////////////////////////////////////////////////////////////

		static inline int32_t validOrNeg1(bool isValid, int32_t value) {
		@@ -201,12 +151,6 @@ static bool optionsReportSizeToVM(JNIEnv* env, jobject options) {
		!env->GetBooleanField(options, gOptions_nativeAllocFieldID);
		}

		static jobject nullObjectReturn(const char msg[]) {
		if (msg) {
		SkDebugf("--- %s\n", msg);
		}
		return NULL;
		}

		static SkPixelRef* installPixelRef(SkBitmap* bitmap, SkStream* stream,
		int sampleSize, bool ditherImage) {
		@@ -377,23 +321,6 @@ static ssize_t getFDSize(int fd) {
		return size;
		}

		/** Restore the file descriptor's offset in our destructor
		*/
		class AutoFDSeek {
		public:
		AutoFDSeek(int fd) : fFD(fd) {
		fCurr = ::lseek(fd, 0, SEEK_CUR);
		}
		~AutoFDSeek() {
		if (fCurr >= 0) {
		::lseek(fFD, fCurr, SEEK_SET);
		}
		}
		private:
		int fFD;
		off_t fCurr;
		};

		static jobject nativeDecodeFileDescriptor(JNIEnv* env, jobject clazz,
		jobject fileDescriptor,
		jobject padding,
		@@ -560,134 +487,6 @@ static void nativeSetDefaultConfig(JNIEnv* env, jobject, int nativeConfig) {
		}
		}

		static SkMemoryStream* buildSkMemoryStream(SkStream *stream) {
		size_t bufferSize = 4096;
		size_t streamLen = 0;
		size_t len;
		char* data = (char*)sk_malloc_throw(bufferSize);

		while ((len = stream->read(data + streamLen,
		bufferSize - streamLen)) != 0) {
		streamLen += len;
		if (streamLen == bufferSize) {
		bufferSize *= 2;
		data = (char*)sk_realloc_throw(data, bufferSize);
		}
		}
		data = (char*)sk_realloc_throw(data, streamLen);
		SkMemoryStream* streamMem = new SkMemoryStream();
		streamMem->setMemoryOwned(data, streamLen);
		return streamMem;
		}

		static jobject doBuildTileIndex(JNIEnv* env, SkStream* stream) {
		SkImageDecoder* decoder = SkImageDecoder::Factory(stream);
		int width, height;
		if (NULL == decoder) {
		doThrowIOE(env, "Image format not supported");
		return nullObjectReturn("SkImageDecoder::Factory returned null");
		}

		JavaPixelAllocator *javaAllocator = new JavaPixelAllocator(env, true);
		decoder->setAllocator(javaAllocator);
		JavaMemoryUsageReporter *javaMemoryReporter = new JavaMemoryUsageReporter(env);
		decoder->setReporter(javaMemoryReporter);
		javaAllocator->unref();
		javaMemoryReporter->unref();

		if (!decoder->buildTileIndex(stream, &width, &height)) {
		char msg[100];
		snprintf(msg, sizeof(msg), "Image failed to decode using %s decoder",
		decoder->getFormatName());
		doThrowIOE(env, msg);
		return nullObjectReturn("decoder->buildTileIndex returned false");
		}

		SkLargeBitmap *bm = new SkLargeBitmap(decoder, width, height);

		return GraphicsJNI::createLargeBitmap(env, bm);
		}

		static jobject nativeCreateLargeBitmapFromByteArray(JNIEnv* env, jobject, jbyteArray byteArray,
		int offset, int length, jboolean isShareable) {
		/* If isShareable we could decide to just wrap the java array and
		share it, but that means adding a globalref to the java array object
		For now we just always copy the array's data if isShareable.
		*/
		AutoJavaByteArray ar(env, byteArray);
		SkStream* stream = new SkMemoryStream(ar.ptr() + offset, length, true);
		return doBuildTileIndex(env, stream);
		}

		static jobject nativeCreateLargeBitmapFromFileDescriptor(JNIEnv* env, jobject clazz,
		jobject fileDescriptor, jboolean isShareable) {
		NPE_CHECK_RETURN_ZERO(env, fileDescriptor);

		jint descriptor = env->GetIntField(fileDescriptor,
		gFileDescriptor_descriptor);
		SkStream *stream = NULL;
		struct stat fdStat;
		int newFD;
		if (fstat(descriptor, &fdStat) == -1) {
		doThrowIOE(env, "broken file descriptor");
		return nullObjectReturn("fstat return -1");
		}

		if (isShareable &&
		S_ISREG(fdStat.st_mode) &&
		(newFD = ::dup(descriptor)) != -1) {
		SkFDStream* fdStream = new SkFDStream(newFD, true);
		if (!fdStream->isValid()) {
		fdStream->unref();
		return NULL;
		}
		stream = fdStream;
		} else {
		SkFDStream* fdStream = new SkFDStream(descriptor, false);
		if (!fdStream->isValid()) {
		fdStream->unref();
		return NULL;
		}
		stream = buildSkMemoryStream(fdStream);
		fdStream->unref();
		}

		/* Restore our offset when we leave, so we can be called more than once
		with the same descriptor. This is only required if we didn't dup the
		file descriptor, but it is OK to do it all the time.
		*/
		AutoFDSeek as(descriptor);

		return doBuildTileIndex(env, stream);
		}

		static jobject nativeCreateLargeBitmapFromStream(JNIEnv* env, jobject clazz,
		jobject is, // InputStream
		jbyteArray storage, // byte[]
		jboolean isShareable) {
		jobject largeBitmap = NULL;
		SkStream* stream = CreateJavaInputStreamAdaptor(env, is, storage, 1024);

		if (stream) {
		// for now we don't allow shareable with java inputstreams
		SkMemoryStream *mStream = buildSkMemoryStream(stream);
		largeBitmap = doBuildTileIndex(env, mStream);
		stream->unref();
		}
		return largeBitmap;
		}

		static jobject nativeCreateLargeBitmapFromAsset(JNIEnv* env, jobject clazz,
		jint native_asset, // Asset
		jboolean isShareable) {
		SkStream* stream, *assStream;
		Asset* asset = reinterpret_cast<Asset*>(native_asset);
		assStream = new AssetStreamAdaptor(asset);
		stream = buildSkMemoryStream(assStream);
		assStream->unref();
		return doBuildTileIndex(env, stream);
		}

		///////////////////////////////////////////////////////////////////////////////

		static JNINativeMethod gMethods[] = {
		@@ -717,26 +516,6 @@ static JNINativeMethod gMethods[] = {
		},

		{ "nativeSetDefaultConfig", "(I)V", (void*)nativeSetDefaultConfig },

		{ "nativeCreateLargeBitmap",
		"([BIIZ)Landroid/graphics/LargeBitmap;",
		(void*)nativeCreateLargeBitmapFromByteArray
		},

		{ "nativeCreateLargeBitmap",
		"(Ljava/io/InputStream;[BZ)Landroid/graphics/LargeBitmap;",
		(void*)nativeCreateLargeBitmapFromStream
		},

		{ "nativeCreateLargeBitmap",
		"(Ljava/io/FileDescriptor;Z)Landroid/graphics/LargeBitmap;",
		(void*)nativeCreateLargeBitmapFromFileDescriptor
		},

		{ "nativeCreateLargeBitmap",
		"(IZ)Landroid/graphics/LargeBitmap;",
		(void*)nativeCreateLargeBitmapFromAsset
		},
		};

		static JNINativeMethod gOptionsMethods[] = {

core/jni/android/graphics/LargeBitmap.cpp→core/jni/android/graphics/BitmapRegionDecoder.cpp

+305 −0

Original line number	Diff line number	Diff line
		#define LOG_TAG "LargeBitmap"
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#define LOG_TAG "BitmapRegionDecoder"

		#include "SkBitmap.h"
		#include "SkImageEncoder.h"
		#include "SkColorPriv.h"
		#include "GraphicsJNI.h"
		#include "SkDither.h"
		#include "SkUnPreMultiply.h"
		#include "SkUtils.h"
		#include "SkTemplates.h"
		#include "SkPixelRef.h"
		#include "SkStream.h"
		#include "BitmapFactory.h"
		#include "AutoDecodeCancel.h"
		#include "SkLargeBitmap.h"
		#include "SkBitmapRegionDecoder.h"
		#include "CreateJavaOutputStreamAdaptor.h"
		#include "Utils.h"

		#include <binder/Parcel.h>
		#include <android_runtime/AndroidRuntime.h>
		#include "android_util_Binder.h"
		#include "android_nio_utils.h"
		#include "CreateJavaOutputStreamAdaptor.h"

		#include <binder/Parcel.h>
		#include <jni.h>
		#include <utils/Asset.h>
		#include <sys/stat.h>

		static jclass gFileDescriptor_class;
		static jfieldID gFileDescriptor_descriptor;

		#if 0
		#define TRACE_BITMAP(code) code
		@@ -26,12 +48,135 @@
		#define TRACE_BITMAP(code)
		#endif

		static jobject nullObjectReturn(const char msg[]) {
		if (msg) {
		SkDebugf("--- %s\n", msg);
		using namespace android;

		static SkMemoryStream* buildSkMemoryStream(SkStream *stream) {
		size_t bufferSize = 4096;
		size_t streamLen = 0;
		size_t len;
		char* data = (char*)sk_malloc_throw(bufferSize);

		while ((len = stream->read(data + streamLen,
		bufferSize - streamLen)) != 0) {
		streamLen += len;
		if (streamLen == bufferSize) {
		bufferSize *= 2;
		data = (char*)sk_realloc_throw(data, bufferSize);
		}
		}
		data = (char*)sk_realloc_throw(data, streamLen);
		SkMemoryStream* streamMem = new SkMemoryStream();
		streamMem->setMemoryOwned(data, streamLen);
		return streamMem;
		}

		static jobject doBuildTileIndex(JNIEnv* env, SkStream* stream) {
		SkImageDecoder* decoder = SkImageDecoder::Factory(stream);
		int width, height;
		if (NULL == decoder) {
		doThrowIOE(env, "Image format not supported");
		return nullObjectReturn("SkImageDecoder::Factory returned null");
		}

		JavaPixelAllocator *javaAllocator = new JavaPixelAllocator(env, true);
		decoder->setAllocator(javaAllocator);
		JavaMemoryUsageReporter *javaMemoryReporter = new JavaMemoryUsageReporter(env);
		decoder->setReporter(javaMemoryReporter);
		javaAllocator->unref();
		javaMemoryReporter->unref();

		if (!decoder->buildTileIndex(stream, &width, &height)) {
		char msg[100];
		snprintf(msg, sizeof(msg), "Image failed to decode using %s decoder",
		decoder->getFormatName());
		doThrowIOE(env, msg);
		return nullObjectReturn("decoder->buildTileIndex returned false");
		}

		SkBitmapRegionDecoder *bm = new SkBitmapRegionDecoder(decoder, width, height);

		return GraphicsJNI::createBitmapRegionDecoder(env, bm);
		}

		static jobject nativeNewInstanceFromByteArray(JNIEnv* env, jobject, jbyteArray byteArray,
		int offset, int length, jboolean isShareable) {
		/* If isShareable we could decide to just wrap the java array and
		share it, but that means adding a globalref to the java array object
		For now we just always copy the array's data if isShareable.
		*/
		AutoJavaByteArray ar(env, byteArray);
		SkStream* stream = new SkMemoryStream(ar.ptr() + offset, length, true);
		return doBuildTileIndex(env, stream);
		}

		static jobject nativeNewInstanceFromFileDescriptor(JNIEnv* env, jobject clazz,
		jobject fileDescriptor, jboolean isShareable) {
		NPE_CHECK_RETURN_ZERO(env, fileDescriptor);

		jint descriptor = env->GetIntField(fileDescriptor,
		gFileDescriptor_descriptor);
		SkStream *stream = NULL;
		struct stat fdStat;
		int newFD;
		if (fstat(descriptor, &fdStat) == -1) {
		doThrowIOE(env, "broken file descriptor");
		return nullObjectReturn("fstat return -1");
		}

		if (isShareable &&
		S_ISREG(fdStat.st_mode) &&
		(newFD = ::dup(descriptor)) != -1) {
		SkFDStream* fdStream = new SkFDStream(newFD, true);
		if (!fdStream->isValid()) {
		fdStream->unref();
		return NULL;
		}
		stream = fdStream;
		} else {
		SkFDStream* fdStream = new SkFDStream(descriptor, false);
		if (!fdStream->isValid()) {
		fdStream->unref();
		return NULL;
		}
		stream = buildSkMemoryStream(fdStream);
		fdStream->unref();
		}

		/* Restore our offset when we leave, so we can be called more than once
		with the same descriptor. This is only required if we didn't dup the
		file descriptor, but it is OK to do it all the time.
		*/
		AutoFDSeek as(descriptor);

		return doBuildTileIndex(env, stream);
		}

		static jobject nativeNewInstanceFromStream(JNIEnv* env, jobject clazz,
		jobject is, // InputStream
		jbyteArray storage, // byte[]
		jboolean isShareable) {
		jobject largeBitmap = NULL;
		SkStream* stream = CreateJavaInputStreamAdaptor(env, is, storage, 1024);

		if (stream) {
		// for now we don't allow shareable with java inputstreams
		SkMemoryStream *mStream = buildSkMemoryStream(stream);
		largeBitmap = doBuildTileIndex(env, mStream);
		stream->unref();
		}
		return largeBitmap;
		}

		static jobject nativeNewInstanceFromAsset(JNIEnv* env, jobject clazz,
		jint native_asset, // Asset
		jboolean isShareable) {
		SkStream* stream, *assStream;
		Asset* asset = reinterpret_cast<Asset*>(native_asset);
		assStream = new AssetStreamAdaptor(asset);
		stream = buildSkMemoryStream(assStream);
		assStream->unref();
		return doBuildTileIndex(env, stream);
		}

		/*
		* nine patch not supported
		@@ -39,9 +184,9 @@ static jobject nullObjectReturn(const char msg[]) {
		* purgeable not supported
		* reportSizeToVM not supported
		*/
		static jobject nativeDecodeRegion(JNIEnv* env, jobject, SkLargeBitmap *bm,
		static jobject nativeDecodeRegion(JNIEnv* env, jobject, SkBitmapRegionDecoder *brd,
		int start_x, int start_y, int width, int height, jobject options) {
		SkImageDecoder *decoder = bm->getDecoder();
		SkImageDecoder *decoder = brd->getDecoder();
		int sampleSize = 1;
		SkBitmap::Config prefConfig = SkBitmap::kNo_Config;
		bool doDither = true;
		@@ -76,7 +221,7 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, SkLargeBitmap *bm,
		region.fRight = start_x + width;
		region.fBottom = start_y + height;

		if (!bm->decodeRegion(bitmap, region, prefConfig, sampleSize)) {
		if (!brd->decodeRegion(bitmap, region, prefConfig, sampleSize)) {
		return nullObjectReturn("decoder->decodeRegion returned false");
		}

		@@ -102,37 +247,59 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, SkLargeBitmap *bm,
		return GraphicsJNI::createBitmap(env, bitmap, false, NULL);
		}

		static int nativeGetHeight(JNIEnv* env, jobject, SkLargeBitmap *bm) {
		return bm->getHeight();
		static int nativeGetHeight(JNIEnv* env, jobject, SkBitmapRegionDecoder *brd) {
		return brd->getHeight();
		}

		static int nativeGetWidth(JNIEnv* env, jobject, SkLargeBitmap *bm) {
		return bm->getWidth();
		static int nativeGetWidth(JNIEnv* env, jobject, SkBitmapRegionDecoder *brd) {
		return brd->getWidth();
		}

		static void nativeClean(JNIEnv* env, jobject, SkLargeBitmap *bm) {
		delete bm;
		static void nativeClean(JNIEnv* env, jobject, SkBitmapRegionDecoder *brd) {
		delete brd;
		}

		///////////////////////////////////////////////////////////////////////////////

		#include <android_runtime/AndroidRuntime.h>

		static JNINativeMethod gLargeBitmapMethods[] = {
		static JNINativeMethod gBitmapRegionDecoderMethods[] = {
		{ "nativeDecodeRegion",
		"(IIIIILandroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;",
		(void*)nativeDecodeRegion},

		{ "nativeGetHeight", "(I)I", (void*)nativeGetHeight},

		{ "nativeGetWidth", "(I)I", (void*)nativeGetWidth},

		{ "nativeClean", "(I)V", (void*)nativeClean},

		{ "nativeNewInstance",
		"([BIIZ)Landroid/graphics/BitmapRegionDecoder;",
		(void*)nativeNewInstanceFromByteArray
		},

		{ "nativeNewInstance",
		"(Ljava/io/InputStream;[BZ)Landroid/graphics/BitmapRegionDecoder;",
		(void*)nativeNewInstanceFromStream
		},

		{ "nativeNewInstance",
		"(Ljava/io/FileDescriptor;Z)Landroid/graphics/BitmapRegionDecoder;",
		(void*)nativeNewInstanceFromFileDescriptor
		},

		{ "nativeNewInstance",
		"(IZ)Landroid/graphics/BitmapRegionDecoder;",
		(void*)nativeNewInstanceFromAsset
		},
		};

		#define kClassPathName "android/graphics/LargeBitmap"
		#define kClassPathName "android/graphics/BitmapRegionDecoder"

		int register_android_graphics_LargeBitmap(JNIEnv* env);
		int register_android_graphics_LargeBitmap(JNIEnv* env)
		int register_android_graphics_BitmapRegionDecoder(JNIEnv* env);
		int register_android_graphics_BitmapRegionDecoder(JNIEnv* env)
		{
		return android::AndroidRuntime::registerNativeMethods(env, kClassPathName,
		gLargeBitmapMethods, SK_ARRAY_COUNT(gLargeBitmapMethods));
		gBitmapRegionDecoderMethods, SK_ARRAY_COUNT(gBitmapRegionDecoderMethods));
		}