diff options
author | Mike Klein <mtklein@google.com> | 2017-12-14 12:10:05 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-14 12:10:12 +0000 |
commit | 63789ccc03f6e63caa3e6c74fee9ad18e073cecf (patch) | |
tree | fdfdf4e8627c10eb7d579ab41140a5c2e25026b3 /src/codec | |
parent | 32af335e7abbf562dad8f1bd21bb013610b8b021 (diff) |
Revert "Remove SkColorSpace_Base::MakeNamed, along with most uses of Adobe RGB"
This reverts commit 411b8ea74d66d08252d9b617d7e7d458604dbc2e.
Reason for revert: a couple layout tests in the roll. :/
Original change's description:
> Remove SkColorSpace_Base::MakeNamed, along with most uses of Adobe RGB
>
> Bug: skia:
> Change-Id: If5935eac48184bc8cbe4db21dac4d6033a8704e6
> Reviewed-on: https://skia-review.googlesource.com/84200
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
TBR=mtklein@chromium.org,brianosman@google.com
Change-Id: I6d2eb57b613035ec26da15218182c808bed364ed
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/84920
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/codec')
-rw-r--r-- | src/codec/SkRawCodec.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/codec/SkRawCodec.cpp b/src/codec/SkRawCodec.cpp index 4fda120bb8..5f3d469b5d 100644 --- a/src/codec/SkRawCodec.cpp +++ b/src/codec/SkRawCodec.cpp @@ -7,7 +7,6 @@ #include "SkCodec.h" #include "SkCodecPriv.h" -#include "SkColorSpacePriv.h" #include "SkColorData.h" #include "SkData.h" #include "SkJpegCodec.h" @@ -655,8 +654,7 @@ std::unique_ptr<SkCodec> SkRawCodec::MakeFromStream(std::unique_ptr<SkStream> st colorSpace = SkColorSpace::MakeSRGB(); break; case ::piex::PreviewImageData::kAdobeRgb: - colorSpace = SkColorSpace::MakeRGB(g2Dot2_TransferFn, - SkColorSpace::kAdobeRGB_Gamut); + colorSpace = SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named); break; } |