diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /gm/downsamplebitmap.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/downsamplebitmap.cpp')
| -rw-r--r-- | gm/downsamplebitmap.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/downsamplebitmap.cpp b/gm/downsamplebitmap.cpp index 5732378703..d7a8b35927 100644 --- a/gm/downsamplebitmap.cpp +++ b/gm/downsamplebitmap.cpp @@ -171,7 +171,7 @@ class DownsampleBitmapImageGM: public DownsampleBitmapGM { int fSize; void make_bitmap() override { - SkImageDecoder* codec = NULL; + SkImageDecoder* codec = nullptr; SkString resourcePath = GetResourcePath(fFilename.c_str()); SkFILEStream stream(resourcePath.c_str()); if (stream.isValid()) { @@ -219,20 +219,20 @@ protected: void onDraw(SkCanvas* canvas) override { SkScalar x = 4; SkScalar y = 4; - canvas->drawBitmap(fBM, x, y, NULL); + canvas->drawBitmap(fBM, x, y, nullptr); y += fBM.height() + 4; - SkAutoTUnref<SkMipMap> mm(SkMipMap::Build(fBM, NULL)); + SkAutoTUnref<SkMipMap> mm(SkMipMap::Build(fBM, nullptr)); SkMipMap::Level level; SkScalar scale = 0.5f; while (mm->extractLevel(scale, &level)) { SkImageInfo info = SkImageInfo::MakeN32Premul(level.fWidth, level.fHeight); SkBitmap bm; - bm.installPixels(info, level.fPixels, level.fRowBytes, NULL, + bm.installPixels(info, level.fPixels, level.fRowBytes, nullptr, &release_mipmap, (void*)(SkRef(mm.get()))); bm.setImmutable(); - canvas->drawBitmap(bm, x, y, NULL); + canvas->drawBitmap(bm, x, y, nullptr); y += bm.height() + 4; scale /= 2; if (info.width() == 1 || info.height() == 1) { |