diff options
author | Matt Sarett <msarett@google.com> | 2017-02-06 12:59:48 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-07 17:00:58 +0000 |
commit | ecaaf6f1c156e5690200322fc2636380c1f63dd8 (patch) | |
tree | a08ca843e15f8d9fd14b2d45f8a7916391052940 /gm/readpixels.cpp | |
parent | 041f7dfc577822f1e97721a865f86a9a02660cf9 (diff) |
SkColorSpace: remove named API, add gamut API
BUG=skia:
Change-Id: I01c5e1874c9a034febc64e25b3aaafb5050393a6
Reviewed-on: https://skia-review.googlesource.com/8021
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'gm/readpixels.cpp')
-rw-r--r-- | gm/readpixels.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/readpixels.cpp b/gm/readpixels.cpp index df7fb0751a..ad9bf8d4f4 100644 --- a/gm/readpixels.cpp +++ b/gm/readpixels.cpp @@ -86,7 +86,7 @@ static sk_sp<SkImage> make_tagged_picture_image() { return SkImage::MakeFromPicture(recorder.finishRecordingAsPicture(), SkISize::Make(kWidth, kHeight), nullptr, nullptr, SkImage::BitDepth::kU8, - SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named)); + SkColorSpace::MakeSRGB()); } static sk_sp<SkImage> make_untagged_picture_image() { @@ -144,7 +144,7 @@ static void draw_image(SkCanvas* canvas, SkImage* image, SkColorType dstColorTyp // Now that we have called readPixels(), dump the raw pixels into an srgb image. sk_sp<SkColorSpace> srgb = fix_for_colortype( - SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named).get(), dstColorType); + SkColorSpace::MakeSRGB().get(), dstColorType); sk_sp<SkImage> raw = SkImage::MakeRasterData(dstInfo.makeColorSpace(srgb), data, rowBytes); canvas->drawImage(raw.get(), 0.0f, 0.0f, nullptr); } @@ -179,7 +179,7 @@ protected: }; const sk_sp<SkColorSpace> colorSpaces[] = { make_wide_gamut(), - SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named), + SkColorSpace::MakeSRGB(), make_small_gamut(), }; @@ -237,7 +237,7 @@ protected: }; const sk_sp<SkColorSpace> colorSpaces[] = { make_wide_gamut(), - SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named), + SkColorSpace::MakeSRGB(), make_small_gamut(), }; const SkImage::CachingHint hints[] = { @@ -304,7 +304,7 @@ protected: }; const sk_sp<SkColorSpace> colorSpaces[] = { make_wide_gamut(), - SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named), + SkColorSpace::MakeSRGB(), make_small_gamut(), }; const SkImage::CachingHint hints[] = { |