diff options
| author |  msarett <msarett@google.com> | 2016-09-07 18:55:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-07 18:55:49 -0700 |
| commit | 48ba2b8550d0d243dddf728b602995b01bc137e1 (patch) | |
| tree | eb28a3ed3c679c4a8626150e2f6297d1fe0a0bf9 /src | |
| parent | 2eb00e7b7783ad612f774b6952a7ca0fa23b17af (diff) | |
Rename SkColorSpace::GammaNamed to SkColorSpace::RenderTargetGamma
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2319293002
Review-Url: https://codereview.chromium.org/2319293002
Diffstat (limited to 'src')
| -rw-r--r-- | src/codec/SkPngCodec.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkColorSpace.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp index 1b8cadbf5e..a268c1fe2f 100644 --- a/src/codec/SkPngCodec.cpp +++ b/src/codec/SkPngCodec.cpp @@ -329,7 +329,7 @@ sk_sp<SkColorSpace> read_color_space(png_structp png_ptr, png_infop info_ptr) { // Default to sRGB gamma if the image has color space information, // but does not specify gamma. - return SkColorSpace::NewRGB(SkColorSpace::kSRGB_GammaNamed, toXYZD50); + return SkColorSpace::NewRGB(SkColorSpace::kSRGB_RenderTargetGamma, toXYZD50); } // Last, check for gamma. diff --git a/src/core/SkColorSpace.cpp b/src/core/SkColorSpace.cpp index 647795fb65..e6676066bb 100644 --- a/src/core/SkColorSpace.cpp +++ b/src/core/SkColorSpace.cpp @@ -121,11 +121,11 @@ sk_sp<SkColorSpace> SkColorSpace_Base::NewRGB(SkGammaNamed gammaNamed, const SkM return sk_sp<SkColorSpace>(new SkColorSpace_Base(gammaNamed, toXYZD50)); } -sk_sp<SkColorSpace> SkColorSpace::NewRGB(GammaNamed gammaNamed, const SkMatrix44& toXYZD50) { - switch (gammaNamed) { - case kLinear_GammaNamed: +sk_sp<SkColorSpace> SkColorSpace::NewRGB(RenderTargetGamma gamma, const SkMatrix44& toXYZD50) { + switch (gamma) { + case kLinear_RenderTargetGamma: return SkColorSpace_Base::NewRGB(kLinear_SkGammaNamed, toXYZD50); - case kSRGB_GammaNamed: + case kSRGB_RenderTargetGamma: return SkColorSpace_Base::NewRGB(kSRGB_SkGammaNamed, toXYZD50); default: return nullptr; |