drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"

Browse Source 
* commit '4ba4caede125ff602b0d93f577f9054a07791ff7':
  Fix SkBitmap::fPixels not being locked correctly
This commit is contained in:
Jean-Baptiste Queru
2012-08-29 11:55:20 -07:00
committed by Android Git Automerger
parent 15e099cc09 4ba4caede1
commit 14c0c989d2
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,8 +298,18 @@ static bool Bitmap_compress(JNIEnv* env, jobject clazz, SkBitmap* bitmap,
} }
bool success = false; bool success = false;
if (NULL != bitmap) {
SkAutoLockPixels alp(*bitmap);
if (NULL == bitmap->getPixels()) {
return false;
}
SkWStream* strm = CreateJavaOutputStreamAdaptor(env, jstream, jstorage); SkWStream* strm = CreateJavaOutputStreamAdaptor(env, jstream, jstorage);
if (NULL != strm) { if (NULL == strm) {
return false;
}
SkImageEncoder* encoder = SkImageEncoder::Create(fm); SkImageEncoder* encoder = SkImageEncoder::Create(fm);
if (NULL != encoder) { if (NULL != encoder) {
success = encoder->encodeStream(strm, *bitmap, quality); success = encoder->encodeStream(strm, *bitmap, quality);