diff options
author | Ben Wagner <bungeman@google.com> | 2017-08-28 10:34:05 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-28 17:48:57 +0000 |
commit | a93a14a99816d25b773f0b12868143702baf44bf (patch) | |
tree | 727e7cb88867bdc12cbcf8baa354ae3afc9444e2 /gm | |
parent | 695db408437807d049ecc02b3b852704092728f2 (diff) |
Convert NULL and 0 to nullptr.
This was created by looking at warnings produced by clang's
-Wzero-as-null-pointer-constant. This updates most issues in
Skia code. However, there are places where GL and Vulkan want
pointer values which are explicitly 0, external headers which
use NULL directly, and possibly more uses in un-compiled
sources (for other platforms).
Change-Id: Id22fbac04d5c53497a53d734f0896b4f06fe8345
Reviewed-on: https://skia-review.googlesource.com/39521
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'gm')
-rw-r--r-- | gm/colorfilterimagefilter.cpp | 2 | ||||
-rw-r--r-- | gm/convexpolyclip.cpp | 2 | ||||
-rw-r--r-- | gm/gamma.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/gm/colorfilterimagefilter.cpp b/gm/colorfilterimagefilter.cpp index 73b9f20d2b..7ca2426a7d 100644 --- a/gm/colorfilterimagefilter.cpp +++ b/gm/colorfilterimagefilter.cpp @@ -180,7 +180,7 @@ DEF_SIMPLE_GM(colorfilterimagefilter_layer, canvas, 32, 32) { sk_sp<SkColorFilter> cf(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat)); SkPaint p; p.setImageFilter(SkColorFilterImageFilter::Make(std::move(cf), nullptr)); - canvas->saveLayer(NULL, &p); + canvas->saveLayer(nullptr, &p); canvas->clear(SK_ColorRED); } diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp index fb7c9d4fab..2de071ff69 100644 --- a/gm/convexpolyclip.cpp +++ b/gm/convexpolyclip.cpp @@ -59,7 +59,7 @@ static SkBitmap make_bmp(int w, int h) { paint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&paint); paint.setTextSize(wScalar / 2.2f); - paint.setShader(0); + paint.setShader(nullptr); paint.setColor(sk_tool_utils::color_to_565(SK_ColorLTGRAY)); constexpr char kTxt[] = "Skia"; SkPoint texPos = { wScalar / 17, hScalar / 2 + paint.getTextSize() / 2.5f }; diff --git a/gm/gamma.cpp b/gm/gamma.cpp index 818895792a..afb1c2b04b 100644 --- a/gm/gamma.cpp +++ b/gm/gamma.cpp @@ -127,11 +127,11 @@ DEF_SIMPLE_GM(gamma, canvas, 850, 200) { // sRGB sources decoded to linear before computing mipmaps? p.setShader(SkShader::MakeBitmapShader(mipmapBmp, rpt, rpt, &scaleMatrix)); p.setFilterQuality(SkFilterQuality::kMedium_SkFilterQuality); - nextRect("MipMaps", 0); + nextRect("MipMaps", nullptr); // 50% grey via paint color. Paint color (SkColor) is specified to be sRGB! p.setColor(0xffbcbcbc); - nextRect("Color", 0); + nextRect("Color", nullptr); { // Black -> White gradient, scaled to sample just the middle. |