diff options
author | Matt Sarett <msarett@google.com> | 2017-02-07 17:06:09 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-07 17:06:24 +0000 |
commit | 1f2fff2544a9dc6a0f169a017d374eca9f04c6b5 (patch) | |
tree | e97779c04ea0d2059cbd6291de3cbfbf27c1cc61 /src/codec/SkPngCodec.cpp | |
parent | ecaaf6f1c156e5690200322fc2636380c1f63dd8 (diff) |
Revert "SkColorSpace: remove named API, add gamut API"
This reverts commit ecaaf6f1c156e5690200322fc2636380c1f63dd8.
Reason for revert: Breaks everything
Original change's description:
> SkColorSpace: remove named API, add gamut API
>
> BUG=skia:
>
> Change-Id: I01c5e1874c9a034febc64e25b3aaafb5050393a6
> Reviewed-on: https://skia-review.googlesource.com/8021
> Reviewed-by: Brian Osman <brianosman@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Matt Sarett <msarett@google.com>
>
TBR=msarett@google.com,brianosman@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: Ief5a0a4eeabe75a21f7512e23fc15309151066c4
Reviewed-on: https://skia-review.googlesource.com/8127
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src/codec/SkPngCodec.cpp')
-rw-r--r-- | src/codec/SkPngCodec.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp index b6258ab8b0..468b0b8731 100644 --- a/src/codec/SkPngCodec.cpp +++ b/src/codec/SkPngCodec.cpp @@ -352,7 +352,7 @@ sk_sp<SkColorSpace> read_color_space(png_structp png_ptr, png_infop info_ptr, // FIXME (msarett): Extract this information from the sRGB chunk once // we are able to handle this information in // SkColorSpace. - return SkColorSpace::MakeSRGB(); + return SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); } // Next, check for chromaticities. @@ -408,7 +408,7 @@ sk_sp<SkColorSpace> read_color_space(png_structp png_ptr, png_infop info_ptr, // Report that there is no color space information in the PNG. // Guess sRGB in this case. - return SkColorSpace::MakeSRGB(); + return SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); } void SkPngCodec::allocateStorage(const SkImageInfo& dstInfo) { @@ -1012,7 +1012,7 @@ void AutoCleanPng::infoCallback() { const bool unsupportedICC = !colorSpace; if (!colorSpace) { // Treat unsupported/invalid color spaces as sRGB. - colorSpace = SkColorSpace::MakeSRGB(); + colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); } SkEncodedInfo encodedInfo = SkEncodedInfo::Make(color, alpha, bitDepth); |