diff options
author | 2015-08-27 07:41:13 -0700 | |
---|---|---|
committer | 2015-08-27 07:41:16 -0700 | |
commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /gm/coloremoji.cpp | |
parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'gm/coloremoji.cpp')
-rw-r--r-- | gm/coloremoji.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index 8ef335a158..6dddc0fdc6 100644 --- a/gm/coloremoji.cpp +++ b/gm/coloremoji.cpp @@ -27,7 +27,7 @@ static SkShader* MakeLinear() { SK_ARRAY_COUNT(kColors), SkShader::kClamp_TileMode); } -static SkImageFilter* make_grayscale(SkImageFilter* input = NULL) { +static SkImageFilter* make_grayscale(SkImageFilter* input = nullptr) { SkScalar matrix[20]; memset(matrix, 0, 20 * sizeof(SkScalar)); matrix[0] = matrix[5] = matrix[10] = 0.2126f; @@ -38,7 +38,7 @@ static SkImageFilter* make_grayscale(SkImageFilter* input = NULL) { return SkColorFilterImageFilter::Create(filter, input); } -static SkImageFilter* make_blur(float amount, SkImageFilter* input = NULL) { +static SkImageFilter* make_blur(float amount, SkImageFilter* input = nullptr) { return SkBlurImageFilter::Create(amount, amount, input); } @@ -98,14 +98,14 @@ protected: } if (SkToBool(makeBlur) && SkToBool(makeGray)) { - SkAutoTUnref<SkImageFilter> grayScale(make_grayscale(NULL)); + SkAutoTUnref<SkImageFilter> grayScale(make_grayscale(nullptr)); SkAutoTUnref<SkImageFilter> blur(make_blur(3.0f, grayScale)); shaderPaint.setImageFilter(blur); } else if (SkToBool(makeBlur)) { - SkAutoTUnref<SkImageFilter> blur(make_blur(3.0f, NULL)); + SkAutoTUnref<SkImageFilter> blur(make_blur(3.0f, nullptr)); shaderPaint.setImageFilter(blur); } else if (SkToBool(makeGray)) { - SkAutoTUnref<SkImageFilter> grayScale(make_grayscale(NULL)); + SkAutoTUnref<SkImageFilter> grayScale(make_grayscale(nullptr)); shaderPaint.setImageFilter(grayScale); } shaderPaint.setTextSize(30); |