diff options
| author |  reed <reed@google.com> | 2016-06-21 10:28:14 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-21 10:28:14 -0700 |
| commit | dabe5d3780dee956882c0d65c979ccd09a99ea8f (patch) | |
| tree | 21f750ea8c8972806287216490dcd25f603a2b96 /include | |
| parent | db197a54b562d92a9da2f849e780aa327e1991ca (diff) | |
update callers to not use SkColorProfileType
Requires https://codereview.chromium.org/2087833002/ to land first.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2086583002
Review-Url: https://codereview.chromium.org/2086583002
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkColorSpace.h | 1 | ||||
| -rw-r--r-- | include/core/SkImageInfo.h | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/core/SkColorSpace.h b/include/core/SkColorSpace.h index ea3e6726b2..4b55c47fea 100644 --- a/include/core/SkColorSpace.h +++ b/include/core/SkColorSpace.h @@ -76,7 +76,6 @@ public: } protected: - SkColorSpace(GammaNamed gammaNamed, const SkMatrix44& toXYZD50, Named named); friend Named sk_deduce_named_from_colorspace(SkColorSpace*); diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h index ba4f850264..b45ee38ee1 100644 --- a/include/core/SkImageInfo.h +++ b/include/core/SkImageInfo.h @@ -13,8 +13,6 @@ #include "SkRect.h" #include "SkSize.h" -#define SK_SUPPORT_LEGACY_COLORPROFILETYPE - class SkReadBuffer; class SkWriteBuffer; @@ -220,8 +218,8 @@ public: /** * Sets colortype to the native ARGB32 type, and the alphatype to premul. */ - static SkImageInfo MakeN32Premul(int width, int height) { - return Make(width, height, kN32_SkColorType, kPremul_SkAlphaType, nullptr); + static SkImageInfo MakeN32Premul(int width, int height, sk_sp<SkColorSpace> cs = nullptr) { + return Make(width, height, kN32_SkColorType, kPremul_SkAlphaType, cs); } static SkImageInfo MakeN32Premul(const SkISize& size) { |