diff options
| author |  brianosman <brianosman@google.com> | 2016-06-16 11:41:44 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-16 11:41:44 -0700 |
| commit | ab8241880d09eb1774b4993ca6df048a27b7020c (patch) | |
| tree | f3c7e4c1873771ee818e0a1c86515a3ea5250d75 /tools/picture_utils.cpp | |
| parent | 6a61a875467646f8dbc37cfecf49e12d1f475170 (diff) | |
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
Diffstat (limited to 'tools/picture_utils.cpp')
| -rw-r--r-- | tools/picture_utils.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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<uint32_t> 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(); |