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

Stop using SkHalfToFloat

Browse Source 
Test: make; CtsGraphicsTestCases

This is intended to be a private API in Skia. Write our own.

Change-Id: I2e6840401487505050828ab49124e8c00f4f3dd9
This commit is contained in:
Leon Scroggins III
2019-01-22 16:33:42 -05:00
parent 1e84afbac2
commit c4892a7fae
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/jni/android_graphics_ColorSpace.cpp
View File

@@ -20,7 +20,6 @@
#include "SkColor.h"
#include "SkColorSpace.h"
#include "SkHalf.h"
using namespace android;
@@ -42,6 +41,12 @@ static skcms_Matrix3x3 getNativeXYZMatrix(JNIEnv* env, jfloatArray xyzD50) {
///////////////////////////////////////////////////////////////////////////////
static float halfToFloat(uint16_t bits) {
__fp16 h;
memcpy(&h, &bits, 2);
return (float)h;
}
SkColor4f GraphicsJNI::convertColorLong(jlong color) {
if ((color & 0x3f) == 0) {
// This corresponds to sRGB, which is treated differently than the rest.
@@ -54,9 +59,9 @@ SkColor4f GraphicsJNI::convertColorLong(jlong color) {
}
// These match the implementation of android.graphics.Color#red(long) etc.
float r = SkHalfToFloat((SkHalf)(color >> 48 & 0xffff));
float g = SkHalfToFloat((SkHalf)(color >> 32 & 0xffff));
float b = SkHalfToFloat((SkHalf)(color >> 16 & 0xffff));
float r = halfToFloat((uint16_t)(color >> 48 & 0xffff));
float g = halfToFloat((uint16_t)(color >> 32 & 0xffff));
float b = halfToFloat((uint16_t)(color >> 16 & 0xffff));
float a = (color >> 6 & 0x3ff) / 1023.0f;
return SkColor4f{r, g, b, a};