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

Commit fa49cc0a authored by Matt Sarett's avatar Matt Sarett Committed by Android (Google) Code Review
Browse files

Merge "Manual revert of "Decode to sRGB in BitmapFactory""

parents 1f44d3b8 8a503649

core/jni/android/graphics/BitmapFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding 
    SkAlphaType alphaType = codec->computeOutputAlphaType(requireUnpremultiplied);



    const SkImageInfo decodeInfo = SkImageInfo::Make(size.width(), size.height(),

            decodeColorType, alphaType, codec->computeOutputColorSpace(decodeColorType));

            decodeColorType, alphaType);



    // We always decode to sRGB, but only mark the bitmap with a color space if linear

    // blending is enabled.