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

Commit 4801a438 authored by Mike Klein's avatar Mike Klein
Browse files

replace SkColorSpaceXform with readPixels() 

I'd like to delete SkColorSpaceXform.  We can do most of what it did
with readPixels(), as seen here.  (For the slim area where readPixels()
isn't enough, we use skcms now.)

Test: make
Change-Id: I88721adaa8a18dc7b30ed2ea20ebec1d3ed5f995
parent 3bc09d10

core/jni/android/graphics/Bitmap.cpp

+4 −8
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include "SkColor.h"

#include "SkColorPriv.h"

#include "SkColorSpace.h"

#include "SkColorSpaceXform.h"

#include "SkHalf.h"

#include "SkMatrix44.h"

#include "SkPM4f.h"
@@ -559,13 +558,10 @@ static jboolean Bitmap_compress(JNIEnv* env, jobject clazz, jlong bitmapHandle, 
        if (!p3.tryAllocPixels(info)) {

            return JNI_FALSE;

        }

        auto xform = SkColorSpaceXform::New(skbitmap.colorSpace(), info.colorSpace());

        if (!xform) {

            return JNI_FALSE;

        }

        if (!xform->apply(SkColorSpaceXform::kRGBA_8888_ColorFormat, p3.getPixels(),

                          SkColorSpaceXform::kRGBA_F16_ColorFormat, skbitmap.getPixels(),

                          info.width() * info.height(), kUnpremul_SkAlphaType)) {



        SkPixmap pm;

        SkAssertResult(p3.peekPixels(&pm));  // should always work if tryAllocPixels() did.

        if (!skbitmap.readPixels(pm)) {

            return JNI_FALSE;

        }

        skbitmap = p3;