diff options
| author |  egdaniel <egdaniel@google.com> | 2016-06-17 15:11:45 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-17 15:11:46 -0700 |
| commit | 802acec1876bb647aaab1bbcfd97748bba54da8f (patch) | |
| tree | 0016427a547439bc8403ff92079c635607db869b /gm/gamma.cpp | |
| parent | 992a22d2e9f976f801c5de06c37f013293f11a82 (diff) | |
Revert of More removal of SkColorProfileType... (patchset #2 id:20001 of https://codereview.chromium.org/2071393002/ )
Reason for revert:
This was still used in chrome
Original issue's description:
> 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
TBR=msarett@google.com,reed@google.com,bsalomon@google.com,brianosman@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2074103004
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 eb4c7607fe..c9fa28be10 100644 --- a/gm/gamma.cpp +++ b/gm/gamma.cpp @@ -18,7 +18,6 @@ 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); @@ -27,20 +26,21 @@ 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, nullptr); + SkImageInfo linearGreyInfo = SkImageInfo::MakeN32(szInt, szInt, kOpaque_SkAlphaType, + kLinear_SkColorProfileType); linearGreyBmp.allocPixels(linearGreyInfo); linearGreyBmp.eraseARGB(0xFF, 0x7F, 0x7F, 0x7F); SkBitmap srgbGreyBmp; SkImageInfo srgbGreyInfo = SkImageInfo::MakeN32(szInt, szInt, kOpaque_SkAlphaType, - srgbColorSpace); + kSRGB_SkColorProfileType); 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, - srgbColorSpace); + SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named)); mipmapBmp.allocPixels(mipmapInfo); SkPMColor* mipmapPixels = reinterpret_cast<SkPMColor*>(mipmapBmp.getPixels()); unsigned s25 = 0x89; // 255 * linear_to_srgb(0.25f) |