From: herb Date: Fri, 15 Apr 2016 19:57:42 +0000 (-0700) Subject: Add ability to default incoming image data as sRGB by default. X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~129^2~949 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d1061cff656fa82a5d6595eb903b45b9393b638;p=platform%2Fupstream%2FlibSkiaSharp.git Add ability to default incoming image data as sRGB by default. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1893663002 Review URL: https://codereview.chromium.org/1893663002 --- diff --git a/src/codec/SkCodecImageGenerator.cpp b/src/codec/SkCodecImageGenerator.cpp index db13aae..2548a00 100644 --- a/src/codec/SkCodecImageGenerator.cpp +++ b/src/codec/SkCodecImageGenerator.cpp @@ -6,6 +6,7 @@ */ #include "SkCodecImageGenerator.h" +#include "SkPM4fPriv.h" SkImageGenerator* SkCodecImageGenerator::NewFromEncodedCodec(SkData* data) { SkCodec* codec = SkCodec::NewFromData(data); @@ -25,9 +26,12 @@ static SkImageInfo fix_info(const SkCodec& codec) { SkAlphaType alphaType = (kUnpremul_SkAlphaType == info.alphaType()) ? kPremul_SkAlphaType : info.alphaType(); - // Crudely guess that the presence of a color space means sRGB. - SkColorProfileType profileType = (codec.getColorSpace()) ? kSRGB_SkColorProfileType : - kLinear_SkColorProfileType; + SkColorProfileType profileType = kLinear_SkColorProfileType; + // Crudely guess that the presence of a color space means sRGB, or obey the global sRGB + // selector. + if (gTreatSkColorAsSRGB || codec.getColorSpace()) { + profileType = kSRGB_SkColorProfileType; + } return SkImageInfo::Make(info.width(), info.height(), info.colorType(), alphaType, profileType); }