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

Merge "Add check if bitmap is hardware in Bitmap.sameAs"

Browse Source
This commit is contained in:
Sergei Vasilinetc
2016-12-15 20:22:53 +00:00
committed by Android (Google) Code Review
parent 1a80b03595 1eabed3d14
commit 9f8cc0aaee
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1131,8 +1131,19 @@ static jboolean Bitmap_sameAs(JNIEnv* env, jobject, jlong bm0Handle,
jlong bm1Handle) {
SkBitmap bm0;
SkBitmap bm1;
reinterpret_cast<BitmapWrapper*>(bm0Handle)->getSkBitmap(&bm0);
reinterpret_cast<BitmapWrapper*>(bm1Handle)->getSkBitmap(&bm1);
LocalScopedBitmap bitmap0(bm0Handle);
LocalScopedBitmap bitmap1(bm1Handle);
// Paying the price for making Hardware Bitmap as Config:
// later check for colorType will pass successfully,
// because Hardware Config internally may be RGBA8888 or smth like that.
if (bitmap0->bitmap().isHardware() != bitmap1->bitmap().isHardware()) {
return JNI_FALSE;
}
bitmap0->bitmap().getSkBitmap(&bm0);
bitmap1->bitmap().getSkBitmap(&bm1);
if (bm0.width() != bm1.width() ||
bm0.height() != bm1.height() ||
bm0.colorType() != bm1.colorType() ||