Index: gm/imagefilterscropped.cpp |
diff --git a/gm/imagefilterscropped.cpp b/gm/imagefilterscropped.cpp |
index c5bef7b3f870a0213a77059cfbae07e3c4e2855d..92e45ea499da310f87c96cd9ee7b349b98b5c899 100644 |
--- a/gm/imagefilterscropped.cpp |
+++ b/gm/imagefilterscropped.cpp |
@@ -60,7 +60,7 @@ static void draw_bitmap(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) { |
bm.allocN32Pixels(bounds.width(), bounds.height()); |
bm.eraseColor(SK_ColorTRANSPARENT); |
SkCanvas c(bm); |
- draw_path(&c, r, NULL); |
+ draw_path(&c, r, nullptr); |
paint.setImageFilter(imf); |
canvas->drawBitmap(bm, 0, 0, &paint); |
@@ -149,23 +149,23 @@ protected: |
SkAutoTUnref<SkImageFilter> cfOffset(SkColorFilterImageFilter::Create(cf.get(), offset.get())); |
- SkAutoTUnref<SkImageFilter> erodeX(SkErodeImageFilter::Create(8, 0, NULL, &cropRect)); |
- SkAutoTUnref<SkImageFilter> erodeY(SkErodeImageFilter::Create(0, 8, NULL, &cropRect)); |
+ SkAutoTUnref<SkImageFilter> erodeX(SkErodeImageFilter::Create(8, 0, nullptr, &cropRect)); |
+ SkAutoTUnref<SkImageFilter> erodeY(SkErodeImageFilter::Create(0, 8, nullptr, &cropRect)); |
SkImageFilter* filters[] = { |
- NULL, |
- SkColorFilterImageFilter::Create(cf.get(), NULL, &cropRect), |
- SkBlurImageFilter::Create(1.0f, 1.0f, NULL, &cropRect), |
- SkBlurImageFilter::Create(8.0f, 0.0f, NULL, &cropRect), |
- SkBlurImageFilter::Create(0.0f, 8.0f, NULL, &cropRect), |
- SkBlurImageFilter::Create(8.0f, 8.0f, NULL, &cropRect), |
- SkErodeImageFilter::Create(1, 1, NULL, &cropRect), |
+ nullptr, |
+ SkColorFilterImageFilter::Create(cf.get(), nullptr, &cropRect), |
+ SkBlurImageFilter::Create(1.0f, 1.0f, nullptr, &cropRect), |
+ SkBlurImageFilter::Create(8.0f, 0.0f, nullptr, &cropRect), |
+ SkBlurImageFilter::Create(0.0f, 8.0f, nullptr, &cropRect), |
+ SkBlurImageFilter::Create(8.0f, 8.0f, nullptr, &cropRect), |
+ SkErodeImageFilter::Create(1, 1, nullptr, &cropRect), |
SkErodeImageFilter::Create(8, 0, erodeY, &cropRect), |
SkErodeImageFilter::Create(0, 8, erodeX, &cropRect), |
- SkErodeImageFilter::Create(8, 8, NULL, &cropRect), |
- SkMergeImageFilter::Create(NULL, cfOffset.get(), SkXfermode::kSrcOver_Mode, &cropRect), |
- SkBlurImageFilter::Create(8.0f, 8.0f, NULL, &bogusRect), |
- SkColorFilterImageFilter::Create(cf.get(), NULL, &bogusRect), |
+ SkErodeImageFilter::Create(8, 8, nullptr, &cropRect), |
+ SkMergeImageFilter::Create(nullptr, cfOffset.get(), SkXfermode::kSrcOver_Mode, &cropRect), |
+ SkBlurImageFilter::Create(8.0f, 8.0f, nullptr, &bogusRect), |
+ SkColorFilterImageFilter::Create(cf.get(), nullptr, &bogusRect), |
}; |
SkRect r = SkRect::MakeWH(SkIntToScalar(64), SkIntToScalar(64)); |