From ab8241880d09eb1774b4993ca6df048a27b7020c Mon Sep 17 00:00:00 2001 From: brianosman Date: Thu, 16 Jun 2016 11:41:44 -0700 Subject: Revert of Lots of progress switching to SkColorSpace rather than SkColorProfileType (patchset #10 id:180001 of https://codereview.chromium.org/2069173002/ ) Reason for revert: Mac crashes in GrUploadPixmapToTexture Original issue's description: > Lots of progress on switching to SkColorSpace rather than SkColorProfileType > > Fixed a bunch of code in Ganesh, as well as usage of SkColorProfileType in most of our tools (DM, SampleApp, Viewer, nanobench, skiaserve, HelloWorld). > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069173002 > > Committed: https://skia.googlesource.com/skia/+/6a61a875467646f8dbc37cfecf49e12d1f475170 TBR=reed@google.com,herb@google.com,msarett@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2072813002 --- tools/picture_utils.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tools/picture_utils.cpp') diff --git a/tools/picture_utils.cpp b/tools/picture_utils.cpp index a6803c67db..63a48ce3e1 100644 --- a/tools/picture_utils.cpp +++ b/tools/picture_utils.cpp @@ -80,9 +80,8 @@ namespace sk_tools { SkAutoTMalloc rgba(w*h); - auto srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); - if (bitmap. colorType() == kN32_SkColorType && - bitmap.colorSpace() == srgbColorSpace.get()) { + if (bitmap. colorType() == kN32_SkColorType && + bitmap.profileType() == kSRGB_SkColorProfileType) { // These are premul sRGB 8-bit pixels in SkPMColor order. // We want unpremul sRGB 8-bit pixels in RGBA order. We'll get there via floats. bitmap.lockPixels(); -- cgit v1.2.3