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

Commit ac88d483 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "[automerger skipped] Merge "Change default IP protocol preference from... 

Merge "[automerger skipped] Merge "Change default IP protocol preference from AUTO to IPV4" into udc-dev am: 4ca1887d am: f16d2249 -s ours am: 5c984c1b -s ours" into udc-qpr-dev-plus-aosp
parents f392d0fb 8fb0f1c1

libs/hwui/hwui/ImageDecoder.cpp

+0 −3
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@ using namespace android; 
sk_sp<SkColorSpace> ImageDecoder::getDefaultColorSpace() const {

    const skcms_ICCProfile* encodedProfile = mCodec->getICCProfile();

    if (encodedProfile) {

        if (encodedProfile->has_CICP) {

            return mCodec->computeOutputColorSpace(kN32_SkColorType);

        }

        // If the profile maps directly to an SkColorSpace, that SkColorSpace

        // will be returned. Otherwise, nullptr will be returned. In either

        // case, using this SkColorSpace results in doing no color correction.