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 /src/core/SkColorSpace_Base.h | |
| 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 'src/core/SkColorSpace_Base.h')
| -rw-r--r-- | src/core/SkColorSpace_Base.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/core/SkColorSpace_Base.h b/src/core/SkColorSpace_Base.h index 015e95f8a1..32e12b4717 100644 --- a/src/core/SkColorSpace_Base.h +++ b/src/core/SkColorSpace_Base.h @@ -187,13 +187,6 @@ public: virtual Type type() const = 0; - typedef uint8_t ICCTypeFlag; - static constexpr ICCTypeFlag kRGB_ICCTypeFlag = 1 << 0; - static constexpr ICCTypeFlag kCMYK_ICCTypeFlag = 1 << 1; - static constexpr ICCTypeFlag kGray_ICCTypeFlag = 1 << 2; - - static sk_sp<SkColorSpace> MakeICC(const void* input, size_t len, ICCTypeFlag type); - static sk_sp<SkColorSpace> MakeRGB(SkGammaNamed gammaNamed, const SkMatrix44& toXYZD50); enum Named : uint8_t { |