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

Merge "Support copying from index8 into another index8." into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-09 22:33:34 +00:00
committed by Android (Google) Code Review
parent 54233f96d7 3b9869e32a
commit f112fde96d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -752,7 +752,8 @@ static jobject Bitmap_creator(JNIEnv* env, jobject, jintArray jColors,
static bool bitmapCopyTo(SkBitmap* dst, SkColorType dstCT, const SkBitmap& src,
SkBitmap::Allocator* alloc) {
LOG_ALWAYS_FATAL_IF(kIndex_8_SkColorType == dstCT, "Error, cannot copyTo kIndex8.");
LOG_ALWAYS_FATAL_IF(kIndex_8_SkColorType == dstCT &&
kIndex_8_SkColorType != src.colorType(), "Error, cannot copyTo kIndex8.");
SkPixmap srcPM;
if (!src.peekPixels(&srcPM)) {
@@ -787,7 +788,7 @@ static bool bitmapCopyTo(SkBitmap* dst, SkColorType dstCT, const SkBitmap& src,
if (!dst->setInfo(dstInfo)) {
return false;
}
if (!dst->tryAllocPixels(alloc, nullptr)) {
if (!dst->tryAllocPixels(alloc, srcPM.ctable())) {
return false;
}