Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4892a7f authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

Stop using SkHalfToFloat 

Test: make; CtsGraphicsTestCases

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

Change-Id: I2e6840401487505050828ab49124e8c00f4f3dd9
parent 1e84afba

core/jni/android_graphics_ColorSpace.cpp

+9 −4
Original line number Diff line number Diff line
@@ -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};