diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-10-31 13:49:14 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-31 18:13:04 +0000 |
| commit | f78b55cb94f4ac89b76a26d5a56d6380aa8fea6b (patch) | |
| tree | 46f0d0bdae4d61a601f6b6d30982fe3d6f39cbd9 /tools | |
| parent | e7ac58c0d5d4585912b2fc26c2d692c6f3c28199 (diff) | |
Simplify SkColorSpace::MakeICC
Rather than restricting the supported ICC types in MakeICC, create any
ICC type that we support, and make the client reject them as necessary
by querying the SkColorSpace::Type.
Remove ICCTypeFlag and replace uses of it with SkColorSpace::Type.
This depends on a change in Chromium
(https://chromium-review.googlesource.com/c/chromium/src/+/741843).
Without that, this change will start allowing non-CMYK images to use
CMYK profiles.
Bug: 727128
Change-Id: I085b4665e49bc80083264496d864cc4cd62ae914
Reviewed-on: https://skia-review.googlesource.com/64841
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/colorspaceinfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/colorspaceinfo.cpp b/tools/colorspaceinfo.cpp index 3e09a9aeeb..0002e961cf 100644 --- a/tools/colorspaceinfo.cpp +++ b/tools/colorspaceinfo.cpp @@ -565,13 +565,13 @@ int main(int argc, char** argv) { SkColorSpace_A2B* a2b = static_cast<SkColorSpace_A2B*>(colorSpace.get()); SkDebugf("Conversion type: "); switch (a2b->iccType()) { - case SkColorSpace_Base::kRGB_ICCTypeFlag: + case SkColorSpace::kRGB_Type: SkDebugf("RGB"); break; - case SkColorSpace_Base::kCMYK_ICCTypeFlag: + case SkColorSpace::kCMYK_Type: SkDebugf("CMYK"); break; - case SkColorSpace_Base::kGray_ICCTypeFlag: + case SkColorSpace::kGray_Type: SkDebugf("Gray"); break; default: |