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

Support copying from index8 into another index8.

Browse Source 
Both bitmap's must share the same color table as we essentially
memcopy the pixel data between the buffers.

Bug: 64112829
Test: CtsGraphicsTestCases
Merged-In: I317e3a814dbd102925fe412d2e19111b0af3af38
Change-Id: I5d99627fe7dd0639bb47a2eb8790510beebe6c6f
This commit is contained in:
Derek Sollenberger
2017-08-04 14:13:57 -04:00
parent 6583c37a1b
commit 3b9869e32a
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;
}