diff options
author | brianosman <brianosman@google.com> | 2016-06-20 08:25:02 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-20 08:25:02 -0700 |
commit | 52ede1d905728cdcaa98db1e4a33724f5a85c62d (patch) | |
tree | 8c95fb157776dc2a561c8de731cac19cc78fa5a0 /gm/gamma.cpp | |
parent | 0ed057542ce545da57cda92dc09c1da8b5fdc363 (diff) |
More removal of SkColorProfileType...
Scrub GMs. Remove the gDefaultProfile thing (it's unused now), along with
the command line flag that was setting it in DM and nanobench.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2071393002
Committed: https://skia.googlesource.com/skia/+/944876f2745a62a839e49275daf93a0329372e67
Review-Url: https://codereview.chromium.org/2071393002
Diffstat (limited to 'gm/gamma.cpp')
-rw-r--r-- | gm/gamma.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/gamma.cpp b/gm/gamma.cpp index c9fa28be10..eb4c7607fe 100644 --- a/gm/gamma.cpp +++ b/gm/gamma.cpp @@ -18,6 +18,7 @@ DEF_SIMPLE_GM(gamma, canvas, 560, 200) { const SkScalar tx = sz + 5.0f; const SkRect r = SkRect::MakeXYWH(0, 0, sz, sz); SkShader::TileMode rpt = SkShader::kRepeat_TileMode; + auto srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); SkBitmap ditherBmp; ditherBmp.allocN32Pixels(2, 2); @@ -26,21 +27,20 @@ DEF_SIMPLE_GM(gamma, canvas, 560, 200) { pixels[1] = pixels[2] = SkPackARGB32(0xFF, 0, 0, 0); SkBitmap linearGreyBmp; - SkImageInfo linearGreyInfo = SkImageInfo::MakeN32(szInt, szInt, kOpaque_SkAlphaType, - kLinear_SkColorProfileType); + SkImageInfo linearGreyInfo = SkImageInfo::MakeN32(szInt, szInt, kOpaque_SkAlphaType, nullptr); linearGreyBmp.allocPixels(linearGreyInfo); linearGreyBmp.eraseARGB(0xFF, 0x7F, 0x7F, 0x7F); SkBitmap srgbGreyBmp; SkImageInfo srgbGreyInfo = SkImageInfo::MakeN32(szInt, szInt, kOpaque_SkAlphaType, - kSRGB_SkColorProfileType); + srgbColorSpace); srgbGreyBmp.allocPixels(srgbGreyInfo); // 0xBC = 255 * linear_to_srgb(0.5f) srgbGreyBmp.eraseARGB(0xFF, 0xBC, 0xBC, 0xBC); SkBitmap mipmapBmp; SkImageInfo mipmapInfo = SkImageInfo::Make(2, 2, kN32_SkColorType, kOpaque_SkAlphaType, - SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named)); + srgbColorSpace); mipmapBmp.allocPixels(mipmapInfo); SkPMColor* mipmapPixels = reinterpret_cast<SkPMColor*>(mipmapBmp.getPixels()); unsigned s25 = 0x89; // 255 * linear_to_srgb(0.25f) |