diff options
| author |  msarett <msarett@google.com> | 2016-09-07 12:03:53 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-07 12:03:53 -0700 |
| commit | 600c737b64eae2c7379442ae2c852853cce3a278 (patch) | |
| tree | 9c06b2092594875460ceecacced12fffa1493ba4 /src/image | |
| parent | 720dc71cfe79d708b28829b99d1ecf4b1e192621 (diff) | |
Delete SkColorSpace::gammaNamed() from public API
Move fGammaNamed to SkColorSpace_Base.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2318663003
Review-Url: https://codereview.chromium.org/2318663003
Diffstat (limited to 'src/image')
| -rw-r--r-- | src/image/SkSurface_Gpu.cpp | 5 | ||||
| -rw-r--r-- | src/image/SkSurface_Raster.cpp | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp index ebe103ac5a..3007313118 100644 --- a/src/image/SkSurface_Gpu.cpp +++ b/src/image/SkSurface_Gpu.cpp @@ -136,8 +136,7 @@ void SkSurface_Gpu::onPrepareForExternalIO() { bool SkSurface_Gpu::Valid(const SkImageInfo& info) { switch (info.colorType()) { case kRGBA_F16_SkColorType: - return info.colorSpace() && - SkColorSpace::kLinear_GammaNamed == info.colorSpace()->gammaNamed(); + return info.colorSpace() && info.colorSpace()->gammaIsLinear(); case kRGBA_8888_SkColorType: case kBGRA_8888_SkColorType: return !info.colorSpace() || info.colorSpace()->gammaCloseToSRGB(); @@ -149,7 +148,7 @@ bool SkSurface_Gpu::Valid(const SkImageInfo& info) { bool SkSurface_Gpu::Valid(GrContext* context, GrPixelConfig config, SkColorSpace* colorSpace) { switch (config) { case kRGBA_half_GrPixelConfig: - return colorSpace && SkColorSpace::kLinear_GammaNamed == colorSpace->gammaNamed(); + return colorSpace && colorSpace->gammaIsLinear(); case kSRGBA_8888_GrPixelConfig: case kSBGRA_8888_GrPixelConfig: return context->caps()->srgbSupport() && colorSpace && colorSpace->gammaCloseToSRGB(); diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp index 9309487c2b..f2cb94a04f 100644 --- a/src/image/SkSurface_Raster.cpp +++ b/src/image/SkSurface_Raster.cpp @@ -67,8 +67,7 @@ bool SkSurface_Raster::Valid(const SkImageInfo& info, size_t rowBytes) { shift = 2; break; case kRGBA_F16_SkColorType: - if (!info.colorSpace() || - SkColorSpace::kLinear_GammaNamed != info.colorSpace()->gammaNamed()) { + if (!info.colorSpace() || !info.colorSpace()->gammaIsLinear()) { return false; } shift = 3; |