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

Merge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev

Browse Source 
am: c025347cf2

Change-Id: I67be64383eeac28ea84ae02a351a92d078b4dac8
This commit is contained in:
Romain Guy
2017-06-09 06:40:44 +00:00
committed by android-build-merger
parent e97fb9f8a3 c025347cf2
commit 0a78ce67b4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -328,11 +328,12 @@ static void FromColor_F16_Raw(void* dst, const SkColor src[], int width,
uint64_t* d = (uint64_t*)dst; uint64_t* d = (uint64_t*)dst;
for (int i = 0; i < width; i++) { for (int i = 0; i < width; i++) {
const float* color = SkColor4f::FromColor(*src++).vec(); const SkColor4f color = SkColor4f::FromColor(*src++);
uint16_t* scratch = reinterpret_cast<uint16_t*>(d++); uint16_t* scratch = reinterpret_cast<uint16_t*>(d++);
for (int i = 0; i < 4; ++i) { scratch[0] = SkFloatToHalf(color.fR);
scratch[i] = SkFloatToHalf(color[i]); scratch[1] = SkFloatToHalf(color.fG);
} scratch[2] = SkFloatToHalf(color.fB);
scratch[3] = SkFloatToHalf(color.fA);
} }
} }