Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 4737 into donut

Browse Source 
* changes:
  Add prepareToDraw() to Bitmap for fixing http://b/issue?id=1907995.
This commit is contained in:
Android (Google) Code Review
2009-06-22 03:48:29 -07:00
parent 8570e5fcf1 8cdcb12752
commit 766d7236c8
3 changed files with 103 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/current.xml
View File

@@ -47001,6 +47001,17 @@
visibility="public" visibility="public"
> >
</method> </method>
<method name="prepareToDraw"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="recycle" <method name="recycle"
return="void" return="void"
abstract="false" abstract="false"

54
core/jni/android/graphics/Bitmap.cpp
View File

@@ -28,7 +28,7 @@ typedef void (*FromColorProc)(void* dst, const SkColor src[], int width,
static void FromColor_D32(void* dst, const SkColor src[], int width, static void FromColor_D32(void* dst, const SkColor src[], int width,
int, int) { int, int) {
SkPMColor* d = (SkPMColor*)dst; SkPMColor* d = (SkPMColor*)dst;
for (int i = 0; i < width; i++) { for (int i = 0; i < width; i++) {
*d++ = SkPreMultiplyColor(*src++); *d++ = SkPreMultiplyColor(*src++);
} }
@@ -37,7 +37,7 @@ static void FromColor_D32(void* dst, const SkColor src[], int width,
static void FromColor_D565(void* dst, const SkColor src[], int width, static void FromColor_D565(void* dst, const SkColor src[], int width,
int x, int y) { int x, int y) {
uint16_t* d = (uint16_t*)dst; uint16_t* d = (uint16_t*)dst;
DITHER_565_SCAN(y); DITHER_565_SCAN(y);
for (int stop = x + width; x < stop; x++) { for (int stop = x + width; x < stop; x++) {
SkColor c = *src++; SkColor c = *src++;
@@ -49,7 +49,7 @@ static void FromColor_D565(void* dst, const SkColor src[], int width,
static void FromColor_D4444(void* dst, const SkColor src[], int width, static void FromColor_D4444(void* dst, const SkColor src[], int width,
int x, int y) { int x, int y) {
SkPMColor16* d = (SkPMColor16*)dst; SkPMColor16* d = (SkPMColor16*)dst;
DITHER_4444_SCAN(y); DITHER_4444_SCAN(y);
for (int stop = x + width; x < stop; x++) { for (int stop = x + width; x < stop; x++) {
SkPMColor c = SkPreMultiplyColor(*src++); SkPMColor c = SkPreMultiplyColor(*src++);
@@ -80,14 +80,14 @@ bool GraphicsJNI::SetPixels(JNIEnv* env, jintArray srcColors,
SkAutoLockPixels alp(dstBitmap); SkAutoLockPixels alp(dstBitmap);
void* dst = dstBitmap.getPixels(); void* dst = dstBitmap.getPixels();
FromColorProc proc = ChooseFromColorProc(dstBitmap.config()); FromColorProc proc = ChooseFromColorProc(dstBitmap.config());
if (NULL == dst || NULL == proc) { if (NULL == dst || NULL == proc) {
return false; return false;
} }
const jint* array = env->GetIntArrayElements(srcColors, NULL); const jint* array = env->GetIntArrayElements(srcColors, NULL);
const SkColor* src = (const SkColor*)array + srcOffset; const SkColor* src = (const SkColor*)array + srcOffset;
// reset to to actual choice from caller // reset to to actual choice from caller
dst = dstBitmap.getAddr(x, y); dst = dstBitmap.getAddr(x, y);
// now copy/convert each scanline // now copy/convert each scanline
@@ -96,7 +96,7 @@ bool GraphicsJNI::SetPixels(JNIEnv* env, jintArray srcColors,
src += srcStride; src += srcStride;
dst = (char*)dst + dstBitmap.rowBytes(); dst = (char*)dst + dstBitmap.rowBytes();
} }
env->ReleaseIntArrayElements(srcColors, const_cast<jint*>(array), env->ReleaseIntArrayElements(srcColors, const_cast<jint*>(array),
JNI_ABORT); JNI_ABORT);
return true; return true;
@@ -212,7 +212,7 @@ static jobject Bitmap_creator(JNIEnv* env, jobject, jintArray jColors,
doThrowIAE(env, "width and height must be > 0"); doThrowIAE(env, "width and height must be > 0");
return NULL; return NULL;
} }
if (NULL != jColors) { if (NULL != jColors) {
size_t n = env->GetArrayLength(jColors); size_t n = env->GetArrayLength(jColors);
if (n < SkAbs32(stride) * (size_t)height) { if (n < SkAbs32(stride) * (size_t)height) {
@@ -222,7 +222,7 @@ static jobject Bitmap_creator(JNIEnv* env, jobject, jintArray jColors,
} }
SkBitmap bitmap; SkBitmap bitmap;
bitmap.setConfig(config, width, height); bitmap.setConfig(config, width, height);
if (!GraphicsJNI::setJavaPixelRef(env, &bitmap, NULL)) { if (!GraphicsJNI::setJavaPixelRef(env, &bitmap, NULL)) {
return NULL; return NULL;
@@ -232,7 +232,7 @@ static jobject Bitmap_creator(JNIEnv* env, jobject, jintArray jColors,
GraphicsJNI::SetPixels(env, jColors, offset, stride, GraphicsJNI::SetPixels(env, jColors, offset, stride,
0, 0, width, height, bitmap); 0, 0, width, height, bitmap);
} }
return GraphicsJNI::createBitmap(env, new SkBitmap(bitmap), isMutable, return GraphicsJNI::createBitmap(env, new SkBitmap(bitmap), isMutable,
NULL); NULL);
} }
@@ -245,7 +245,7 @@ static jobject Bitmap_copy(JNIEnv* env, jobject, const SkBitmap* src,
if (!src->copyTo(&result, dstConfig, &allocator)) { if (!src->copyTo(&result, dstConfig, &allocator)) {
return NULL; return NULL;
} }
return GraphicsJNI::createBitmap(env, new SkBitmap(result), isMutable, return GraphicsJNI::createBitmap(env, new SkBitmap(result), isMutable,
NULL); NULL);
} }
@@ -324,15 +324,15 @@ static jobject Bitmap_createFromParcel(JNIEnv* env, jobject, jobject parcel) {
SkDebugf("-------- unparcel parcel is NULL\n"); SkDebugf("-------- unparcel parcel is NULL\n");
return NULL; return NULL;
} }
android::Parcel* p = android::parcelForJavaObject(env, parcel); android::Parcel* p = android::parcelForJavaObject(env, parcel);
const bool isMutable = p->readInt32() != 0; const bool isMutable = p->readInt32() != 0;
const SkBitmap::Config config = (SkBitmap::Config)p->readInt32(); const SkBitmap::Config config = (SkBitmap::Config)p->readInt32();
const int width = p->readInt32(); const int width = p->readInt32();
const int height = p->readInt32(); const int height = p->readInt32();
const int rowBytes = p->readInt32(); const int rowBytes = p->readInt32();
if (SkBitmap::kARGB_8888_Config != config && if (SkBitmap::kARGB_8888_Config != config &&
SkBitmap::kRGB_565_Config != config && SkBitmap::kRGB_565_Config != config &&
SkBitmap::kARGB_4444_Config != config && SkBitmap::kARGB_4444_Config != config &&
@@ -355,7 +355,7 @@ static jobject Bitmap_createFromParcel(JNIEnv* env, jobject, jobject parcel) {
ctable = new SkColorTable(src, count); ctable = new SkColorTable(src, count);
} }
} }
if (!GraphicsJNI::setJavaPixelRef(env, bitmap, ctable)) { if (!GraphicsJNI::setJavaPixelRef(env, bitmap, ctable)) {
ctable->safeUnref(); ctable->safeUnref();
delete bitmap; delete bitmap;
@@ -368,7 +368,7 @@ static jobject Bitmap_createFromParcel(JNIEnv* env, jobject, jobject parcel) {
bitmap->lockPixels(); bitmap->lockPixels();
memcpy(bitmap->getPixels(), p->readInplace(size), size); memcpy(bitmap->getPixels(), p->readInplace(size), size);
bitmap->unlockPixels(); bitmap->unlockPixels();
return GraphicsJNI::createBitmap(env, bitmap, isMutable, NULL); return GraphicsJNI::createBitmap(env, bitmap, isMutable, NULL);
} }
@@ -381,7 +381,7 @@ static jboolean Bitmap_writeToParcel(JNIEnv* env, jobject,
} }
android::Parcel* p = android::parcelForJavaObject(env, parcel); android::Parcel* p = android::parcelForJavaObject(env, parcel);
p->writeInt32(isMutable); p->writeInt32(isMutable);
p->writeInt32(bitmap->config()); p->writeInt32(bitmap->config());
p->writeInt32(bitmap->width()); p->writeInt32(bitmap->width());
@@ -413,7 +413,7 @@ static jobject Bitmap_extractAlpha(JNIEnv* env, jobject clazz,
jintArray offsetXY) { jintArray offsetXY) {
SkIPoint offset; SkIPoint offset;
SkBitmap* dst = new SkBitmap; SkBitmap* dst = new SkBitmap;
src->extractAlpha(dst, paint, &offset); src->extractAlpha(dst, paint, &offset);
if (offsetXY != 0 && env->GetArrayLength(offsetXY) >= 2) { if (offsetXY != 0 && env->GetArrayLength(offsetXY) >= 2) {
int* array = env->GetIntArrayElements(offsetXY, NULL); int* array = env->GetIntArrayElements(offsetXY, NULL);
@@ -421,7 +421,7 @@ static jobject Bitmap_extractAlpha(JNIEnv* env, jobject clazz,
array[1] = offset.fY; array[1] = offset.fY;
env->ReleaseIntArrayElements(offsetXY, array, 0); env->ReleaseIntArrayElements(offsetXY, array, 0);
} }
return GraphicsJNI::createBitmap(env, dst, true, NULL); return GraphicsJNI::createBitmap(env, dst, true, NULL);
} }
@@ -439,7 +439,7 @@ static int Bitmap_getPixel(JNIEnv* env, jobject, const SkBitmap* bitmap,
if (NULL == src) { if (NULL == src) {
return 0; return 0;
} }
SkColor dst[1]; SkColor dst[1];
proc(dst, src, 1, bitmap->getColorTable()); proc(dst, src, 1, bitmap->getColorTable());
return dst[0]; return dst[0];
@@ -449,7 +449,7 @@ static void Bitmap_getPixels(JNIEnv* env, jobject, const SkBitmap* bitmap,
jintArray pixelArray, int offset, int stride, jintArray pixelArray, int offset, int stride,
int x, int y, int width, int height) { int x, int y, int width, int height) {
SkAutoLockPixels alp(*bitmap); SkAutoLockPixels alp(*bitmap);
ToColorProc proc = ChooseToColorProc(*bitmap); ToColorProc proc = ChooseToColorProc(*bitmap);
if (NULL == proc) { if (NULL == proc) {
return; return;
@@ -498,7 +498,7 @@ static void Bitmap_copyPixelsToBuffer(JNIEnv* env, jobject,
const SkBitmap* bitmap, jobject jbuffer) { const SkBitmap* bitmap, jobject jbuffer) {
SkAutoLockPixels alp(*bitmap); SkAutoLockPixels alp(*bitmap);
const void* src = bitmap->getPixels(); const void* src = bitmap->getPixels();
if (NULL != src) { if (NULL != src) {
android::AutoBufferPointer abp(env, jbuffer, JNI_TRUE); android::AutoBufferPointer abp(env, jbuffer, JNI_TRUE);
@@ -511,7 +511,7 @@ static void Bitmap_copyPixelsFromBuffer(JNIEnv* env, jobject,
const SkBitmap* bitmap, jobject jbuffer) { const SkBitmap* bitmap, jobject jbuffer) {
SkAutoLockPixels alp(*bitmap); SkAutoLockPixels alp(*bitmap);
void* dst = bitmap->getPixels(); void* dst = bitmap->getPixels();
if (NULL != dst) { if (NULL != dst) {
android::AutoBufferPointer abp(env, jbuffer, JNI_FALSE); android::AutoBufferPointer abp(env, jbuffer, JNI_FALSE);
// the java side has already checked that buffer is large enough // the java side has already checked that buffer is large enough
@@ -519,6 +519,11 @@ static void Bitmap_copyPixelsFromBuffer(JNIEnv* env, jobject,
} }
} }
static void Bitmap_prepareToDraw(JNIEnv* env, jobject, SkBitmap* bitmap) {
bitmap->lockPixels();
bitmap->unlockPixels();
}
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
@@ -552,7 +557,8 @@ static JNINativeMethod gBitmapMethods[] = {
{ "nativeCopyPixelsToBuffer", "(ILjava/nio/Buffer;)V", { "nativeCopyPixelsToBuffer", "(ILjava/nio/Buffer;)V",
(void*)Bitmap_copyPixelsToBuffer }, (void*)Bitmap_copyPixelsToBuffer },
{ "nativeCopyPixelsFromBuffer", "(ILjava/nio/Buffer;)V", { "nativeCopyPixelsFromBuffer", "(ILjava/nio/Buffer;)V",
(void*)Bitmap_copyPixelsFromBuffer } (void*)Bitmap_copyPixelsFromBuffer },
{ "nativePrepareToDraw", "(I)V", (void*)Bitmap_prepareToDraw }
}; };
#define kClassPathName "android/graphics/Bitmap" #define kClassPathName "android/graphics/Bitmap"

106
graphics/java/android/graphics/Bitmap.java
View File

@@ -16,14 +16,14 @@
package android.graphics; package android.graphics;
import android.os.Parcelable;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable;
import java.io.OutputStream;
import java.nio.Buffer; import java.nio.Buffer;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ShortBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.io.OutputStream; import java.nio.ShortBuffer;
public final class Bitmap implements Parcelable { public final class Bitmap implements Parcelable {
/** /**
@@ -32,14 +32,14 @@ public final class Bitmap implements Parcelable {
* @see Bitmap#getDensityScale() * @see Bitmap#getDensityScale()
* @see Bitmap#setDensityScale(float) * @see Bitmap#setDensityScale(float)
* *
* @hide pending API council approval * @hide pending API council approval
*/ */
public static final float DENSITY_SCALE_UNKNOWN = -1.0f; public static final float DENSITY_SCALE_UNKNOWN = -1.0f;
// Note: mNativeBitmap is used by FaceDetector_jni.cpp // Note: mNativeBitmap is used by FaceDetector_jni.cpp
// Don't change/rename without updating FaceDetector_jni.cpp // Don't change/rename without updating FaceDetector_jni.cpp
private final int mNativeBitmap; private final int mNativeBitmap;
private final boolean mIsMutable; private final boolean mIsMutable;
private byte[] mNinePatchChunk; // may be null private byte[] mNinePatchChunk; // may be null
private int mWidth = -1; private int mWidth = -1;
@@ -63,7 +63,7 @@ public final class Bitmap implements Parcelable {
if (nativeBitmap == 0) { if (nativeBitmap == 0) {
throw new RuntimeException("internal error: native bitmap is 0"); throw new RuntimeException("internal error: native bitmap is 0");
} }
// we delete this in our finalizer // we delete this in our finalizer
mNativeBitmap = nativeBitmap; mNativeBitmap = nativeBitmap;
mIsMutable = isMutable; mIsMutable = isMutable;
@@ -83,7 +83,7 @@ public final class Bitmap implements Parcelable {
* *
* @see #setDensityScale(float) * @see #setDensityScale(float)
* @see #isAutoScalingEnabled() * @see #isAutoScalingEnabled()
* @see #setAutoScalingEnabled(boolean) * @see #setAutoScalingEnabled(boolean)
* @see android.util.DisplayMetrics#DEFAULT_DENSITY * @see android.util.DisplayMetrics#DEFAULT_DENSITY
* @see android.util.DisplayMetrics#density * @see android.util.DisplayMetrics#density
* @see #DENSITY_SCALE_UNKNOWN * @see #DENSITY_SCALE_UNKNOWN
@@ -105,7 +105,7 @@ public final class Bitmap implements Parcelable {
* *
* @see #getDensityScale() * @see #getDensityScale()
* @see #isAutoScalingEnabled() * @see #isAutoScalingEnabled()
* @see #setAutoScalingEnabled(boolean) * @see #setAutoScalingEnabled(boolean)
* @see android.util.DisplayMetrics#DEFAULT_DENSITY * @see android.util.DisplayMetrics#DEFAULT_DENSITY
* @see android.util.DisplayMetrics#density * @see android.util.DisplayMetrics#density
* @see #DENSITY_SCALE_UNKNOWN * @see #DENSITY_SCALE_UNKNOWN
@@ -126,7 +126,7 @@ public final class Bitmap implements Parcelable {
* <p>Auto scaling is turned off by default. If auto scaling is enabled but the * <p>Auto scaling is turned off by default. If auto scaling is enabled but the
* bitmap has an unknown density scale, then the bitmap will never be automatically * bitmap has an unknown density scale, then the bitmap will never be automatically
* scaled at drawing time.</p> * scaled at drawing time.</p>
* *
* @return True if the bitmap must be scaled at drawing time, false otherwise. * @return True if the bitmap must be scaled at drawing time, false otherwise.
* *
* @see #setAutoScalingEnabled(boolean) * @see #setAutoScalingEnabled(boolean)
@@ -167,7 +167,7 @@ public final class Bitmap implements Parcelable {
public void setNinePatchChunk(byte[] chunk) { public void setNinePatchChunk(byte[] chunk) {
mNinePatchChunk = chunk; mNinePatchChunk = chunk;
} }
/** /**
* Free up the memory associated with this bitmap's pixels, and mark the * Free up the memory associated with this bitmap's pixels, and mark the
* bitmap as "dead", meaning it will throw an exception if getPixels() or * bitmap as "dead", meaning it will throw an exception if getPixels() or
@@ -194,7 +194,7 @@ public final class Bitmap implements Parcelable {
public final boolean isRecycled() { public final boolean isRecycled() {
return mRecycled; return mRecycled;
} }
/** /**
* This is called by methods that want to throw an exception if the bitmap * This is called by methods that want to throw an exception if the bitmap
* has already been recycled. * has already been recycled.
@@ -204,7 +204,7 @@ public final class Bitmap implements Parcelable {
throw new IllegalStateException(errorMessage); throw new IllegalStateException(errorMessage);
} }
} }
/** /**
* Common code for checking that x and y are >= 0 * Common code for checking that x and y are >= 0
* *
@@ -246,16 +246,16 @@ public final class Bitmap implements Parcelable {
this.nativeInt = ni; this.nativeInt = ni;
} }
final int nativeInt; final int nativeInt;
/* package */ static Config nativeToConfig(int ni) { /* package */ static Config nativeToConfig(int ni) {
return sConfigs[ni]; return sConfigs[ni];
} }
private static Config sConfigs[] = { private static Config sConfigs[] = {
null, null, ALPHA_8, null, RGB_565, ARGB_4444, ARGB_8888 null, null, ALPHA_8, null, RGB_565, ARGB_4444, ARGB_8888
}; };
} }
/** /**
* Copy the bitmap's pixels into the specified buffer (allocated by the * Copy the bitmap's pixels into the specified buffer (allocated by the
* caller). An exception is thrown if the buffer is not large enough to * caller). An exception is thrown if the buffer is not large enough to
@@ -275,16 +275,16 @@ public final class Bitmap implements Parcelable {
} else { } else {
throw new RuntimeException("unsupported Buffer subclass"); throw new RuntimeException("unsupported Buffer subclass");
} }
long bufferSize = (long)elements << shift; long bufferSize = (long)elements << shift;
long pixelSize = (long)getRowBytes() * getHeight(); long pixelSize = (long)getRowBytes() * getHeight();
if (bufferSize < pixelSize) { if (bufferSize < pixelSize) {
throw new RuntimeException("Buffer not large enough for pixels"); throw new RuntimeException("Buffer not large enough for pixels");
} }
nativeCopyPixelsToBuffer(mNativeBitmap, dst); nativeCopyPixelsToBuffer(mNativeBitmap, dst);
// now update the buffer's position // now update the buffer's position
int position = dst.position(); int position = dst.position();
position += pixelSize >> shift; position += pixelSize >> shift;
@@ -299,7 +299,7 @@ public final class Bitmap implements Parcelable {
*/ */
public void copyPixelsFromBuffer(Buffer src) { public void copyPixelsFromBuffer(Buffer src) {
checkRecycled("copyPixelsFromBuffer called on recycled bitmap"); checkRecycled("copyPixelsFromBuffer called on recycled bitmap");
int elements = src.remaining(); int elements = src.remaining();
int shift; int shift;
if (src instanceof ByteBuffer) { if (src instanceof ByteBuffer) {
@@ -311,17 +311,17 @@ public final class Bitmap implements Parcelable {
} else { } else {
throw new RuntimeException("unsupported Buffer subclass"); throw new RuntimeException("unsupported Buffer subclass");
} }
long bufferBytes = (long)elements << shift; long bufferBytes = (long)elements << shift;
long bitmapBytes = (long)getRowBytes() * getHeight(); long bitmapBytes = (long)getRowBytes() * getHeight();
if (bufferBytes < bitmapBytes) { if (bufferBytes < bitmapBytes) {
throw new RuntimeException("Buffer not large enough for pixels"); throw new RuntimeException("Buffer not large enough for pixels");
} }
nativeCopyPixelsFromBuffer(mNativeBitmap, src); nativeCopyPixelsFromBuffer(mNativeBitmap, src);
} }
/** /**
* Tries to make a new bitmap based on the dimensions of this bitmap, * Tries to make a new bitmap based on the dimensions of this bitmap,
* setting the new bitmap's config to the one specified, and then copying * setting the new bitmap's config to the one specified, and then copying
@@ -350,7 +350,7 @@ public final class Bitmap implements Parcelable {
if (m == null) { if (m == null) {
m = new Matrix(); m = new Matrix();
} }
final int width = src.getWidth(); final int width = src.getWidth();
final int height = src.getHeight(); final int height = src.getHeight();
final float sx = dstWidth / (float)width; final float sx = dstWidth / (float)width;
@@ -365,9 +365,9 @@ public final class Bitmap implements Parcelable {
} }
} }
return b; return b;
} }
/** /**
* Returns an immutable bitmap from the source bitmap. The new bitmap may * Returns an immutable bitmap from the source bitmap. The new bitmap may
* be the same object as source, or a copy may have been made. * be the same object as source, or a copy may have been made.
@@ -390,7 +390,7 @@ public final class Bitmap implements Parcelable {
public static Bitmap createBitmap(Bitmap source, int x, int y, int width, int height) { public static Bitmap createBitmap(Bitmap source, int x, int y, int width, int height) {
return createBitmap(source, x, y, width, height, null, false); return createBitmap(source, x, y, width, height, null, false);
} }
/** /**
* Returns an immutable bitmap from subset of the source bitmap, * Returns an immutable bitmap from subset of the source bitmap,
* transformed by the optional matrix. * transformed by the optional matrix.
@@ -425,7 +425,7 @@ public final class Bitmap implements Parcelable {
height == source.getHeight() && (m == null || m.isIdentity())) { height == source.getHeight() && (m == null || m.isIdentity())) {
return source; return source;
} }
int neww = width; int neww = width;
int newh = height; int newh = height;
Canvas canvas = new Canvas(); Canvas canvas = new Canvas();
@@ -470,7 +470,7 @@ public final class Bitmap implements Parcelable {
return bitmap; return bitmap;
} }
/** /**
* Returns a mutable bitmap with the specified width and height. * Returns a mutable bitmap with the specified width and height.
* *
@@ -484,7 +484,7 @@ public final class Bitmap implements Parcelable {
bm.eraseColor(0); // start with black/transparent pixels bm.eraseColor(0); // start with black/transparent pixels
return bm; return bm;
} }
/** /**
* Returns a immutable bitmap with the specified width and height, with each * Returns a immutable bitmap with the specified width and height, with each
* pixel value set to the corresponding value in the colors array. * pixel value set to the corresponding value in the colors array.
@@ -593,7 +593,7 @@ public final class Bitmap implements Parcelable {
return nativeCompress(mNativeBitmap, format.nativeInt, quality, return nativeCompress(mNativeBitmap, format.nativeInt, quality,
stream, new byte[WORKING_COMPRESS_STORAGE]); stream, new byte[WORKING_COMPRESS_STORAGE]);
} }
/** /**
* Returns true if the bitmap is marked as mutable (i.e. can be drawn into) * Returns true if the bitmap is marked as mutable (i.e. can be drawn into)
*/ */
@@ -610,7 +610,7 @@ public final class Bitmap implements Parcelable {
public final int getHeight() { public final int getHeight() {
return mHeight == -1 ? mHeight = nativeHeight(mNativeBitmap) : mHeight; return mHeight == -1 ? mHeight = nativeHeight(mNativeBitmap) : mHeight;
} }
/** /**
* Convenience method that returns the width of this bitmap divided * Convenience method that returns the width of this bitmap divided
* by the density scale factor. * by the density scale factor.
@@ -648,7 +648,7 @@ public final class Bitmap implements Parcelable {
public final int getRowBytes() { public final int getRowBytes() {
return nativeRowBytes(mNativeBitmap); return nativeRowBytes(mNativeBitmap);
} }
/** /**
* If the bitmap's internal config is in one of the public formats, return * If the bitmap's internal config is in one of the public formats, return
* that config, otherwise return null. * that config, otherwise return null.
@@ -690,7 +690,7 @@ public final class Bitmap implements Parcelable {
checkPixelAccess(x, y); checkPixelAccess(x, y);
return nativeGetPixel(mNativeBitmap, x, y); return nativeGetPixel(mNativeBitmap, x, y);
} }
/** /**
* Returns in pixels[] a copy of the data in the bitmap. Each value is * Returns in pixels[] a copy of the data in the bitmap. Each value is
* a packed int representing a {@link Color}. The stride parameter allows * a packed int representing a {@link Color}. The stride parameter allows
@@ -722,7 +722,7 @@ public final class Bitmap implements Parcelable {
nativeGetPixels(mNativeBitmap, pixels, offset, stride, nativeGetPixels(mNativeBitmap, pixels, offset, stride,
x, y, width, height); x, y, width, height);
} }
/** /**
* Shared code to check for illegal arguments passed to getPixel() * Shared code to check for illegal arguments passed to getPixel()
* or setPixel() * or setPixel()
@@ -779,7 +779,7 @@ public final class Bitmap implements Parcelable {
throw new ArrayIndexOutOfBoundsException(); throw new ArrayIndexOutOfBoundsException();
} }
} }
/** /**
* Write the specified {@link Color} into the bitmap (assuming it is * Write the specified {@link Color} into the bitmap (assuming it is
* mutable) at the x,y coordinate. * mutable) at the x,y coordinate.
@@ -799,10 +799,10 @@ public final class Bitmap implements Parcelable {
checkPixelAccess(x, y); checkPixelAccess(x, y);
nativeSetPixel(mNativeBitmap, x, y, color); nativeSetPixel(mNativeBitmap, x, y, color);
} }
/** /**
* Replace pixels in the bitmap with the colors in the array. Each element * Replace pixels in the bitmap with the colors in the array. Each element
* in the array is a packed int prepresenting a {@link Color} * in the array is a packed int prepresenting a {@link Color}
* *
* @param pixels The colors to write to the bitmap * @param pixels The colors to write to the bitmap
* @param offset The index of the first color to read from pixels[] * @param offset The index of the first color to read from pixels[]
@@ -834,7 +834,7 @@ public final class Bitmap implements Parcelable {
nativeSetPixels(mNativeBitmap, pixels, offset, stride, nativeSetPixels(mNativeBitmap, pixels, offset, stride,
x, y, width, height); x, y, width, height);
} }
public static final Parcelable.Creator<Bitmap> CREATOR public static final Parcelable.Creator<Bitmap> CREATOR
= new Parcelable.Creator<Bitmap>() { = new Parcelable.Creator<Bitmap>() {
/** /**
@@ -884,7 +884,7 @@ public final class Bitmap implements Parcelable {
public Bitmap extractAlpha() { public Bitmap extractAlpha() {
return extractAlpha(null, null); return extractAlpha(null, null);
} }
/** /**
* Returns a new bitmap that captures the alpha values of the original. * Returns a new bitmap that captures the alpha values of the original.
* These values may be affected by the optional Paint parameter, which * These values may be affected by the optional Paint parameter, which
@@ -917,6 +917,22 @@ public final class Bitmap implements Parcelable {
return bm; return bm;
} }
/**
* Rebuilds any caches associated with the bitmap that are used for
* drawing it. In the case of purgeable bitmaps, this call will attempt to
* ensure that the pixels have been decoded.
* If this is called on more than one bitmap in sequence, the priority is
* given in LRU order (i.e. the last bitmap called will be given highest
* priority).
*
* For bitmaps with no associated caches, this call is effectively a no-op,
* and therefore is harmless.
*/
public void prepareToDraw() {
nativePrepareToDraw(mNativeBitmap);
}
@Override
protected void finalize() throws Throwable { protected void finalize() throws Throwable {
try { try {
nativeDestructor(mNativeBitmap); nativeDestructor(mNativeBitmap);
@@ -924,7 +940,7 @@ public final class Bitmap implements Parcelable {
super.finalize(); super.finalize();
} }
} }
//////////// native methods //////////// native methods
private static native Bitmap nativeCreate(int[] colors, int offset, private static native Bitmap nativeCreate(int[] colors, int offset,
@@ -944,12 +960,12 @@ public final class Bitmap implements Parcelable {
private static native int nativeRowBytes(int nativeBitmap); private static native int nativeRowBytes(int nativeBitmap);
private static native int nativeConfig(int nativeBitmap); private static native int nativeConfig(int nativeBitmap);
private static native boolean nativeHasAlpha(int nativeBitmap); private static native boolean nativeHasAlpha(int nativeBitmap);
private static native int nativeGetPixel(int nativeBitmap, int x, int y); private static native int nativeGetPixel(int nativeBitmap, int x, int y);
private static native void nativeGetPixels(int nativeBitmap, int[] pixels, private static native void nativeGetPixels(int nativeBitmap, int[] pixels,
int offset, int stride, int x, int offset, int stride, int x,
int y, int width, int height); int y, int width, int height);
private static native void nativeSetPixel(int nativeBitmap, int x, int y, private static native void nativeSetPixel(int nativeBitmap, int x, int y,
int color); int color);
private static native void nativeSetPixels(int nativeBitmap, int[] colors, private static native void nativeSetPixels(int nativeBitmap, int[] colors,
@@ -969,6 +985,8 @@ public final class Bitmap implements Parcelable {
int nativePaint, int nativePaint,
int[] offsetXY); int[] offsetXY);
private static native void nativePrepareToDraw(int nativeBitmap);
/* package */ final int ni() { /* package */ final int ni() {
return mNativeBitmap; return mNativeBitmap;
} }