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

Merge "[automerger skipped] Merge "Change default IP protocol preference from AUTO to IPV4" into udc-dev am: 4ca1887dd7 am: f16d2249fe -s ours am: 5c984c1b40 -s ours" into udc-qpr-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2023-05-11 14:45:44 +00:00
committed by Android (Google) Code Review
parent f392d0fb21 8fb0f1c18e
commit ac88d483ea
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hwui/hwui/ImageDecoder.cpp
View File

@@ -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.