gm/displacement.cpp - Issue 1316233002: Style Change: NULL->nullptr

Unified Diff: gm/displacement.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: gm/displacement.cpp

diff --git a/gm/displacement.cpp b/gm/displacement.cpp

index 4450fe2eecd423f2ac928163e23918f2acf23cca..353d14ecd8d90bc5ac8cf0163bf656b523274647 100644

--- a/gm/displacement.cpp

+++ b/gm/displacement.cpp

@@ -118,53 +118,53 @@ protected:

paint.setImageFilter(SkDisplacementMapEffect::Create(

SkDisplacementMapEffect::kR_ChannelSelectorType,

SkDisplacementMapEffect::kG_ChannelSelectorType,

- 0.0f, displ, NULL, &cropRect))->unref();

+ 0.0f, displ, nullptr, &cropRect))->unref();

drawClippedBitmap(canvas, 0, 200, paint);

paint.setImageFilter(SkDisplacementMapEffect::Create(

SkDisplacementMapEffect::kB_ChannelSelectorType,

SkDisplacementMapEffect::kA_ChannelSelectorType,

- 16.0f, displ, NULL, &cropRect))->unref();

+ 16.0f, displ, nullptr, &cropRect))->unref();

drawClippedBitmap(canvas, 100, 200, paint);

paint.setImageFilter(SkDisplacementMapEffect::Create(

SkDisplacementMapEffect::kR_ChannelSelectorType,

SkDisplacementMapEffect::kB_ChannelSelectorType,

- 32.0f, displ, NULL, &cropRect))->unref();

+ 32.0f, displ, nullptr, &cropRect))->unref();

drawClippedBitmap(canvas, 200, 200, paint);

paint.setImageFilter(SkDisplacementMapEffect::Create(

SkDisplacementMapEffect::kG_ChannelSelectorType,

SkDisplacementMapEffect::kA_ChannelSelectorType,

- 48.0f, displ, NULL, &cropRect))->unref();

+ 48.0f, displ, nullptr, &cropRect))->unref();

drawClippedBitmap(canvas, 300, 200, paint);

paint.setImageFilter(SkDisplacementMapEffect::Create(

SkDisplacementMapEffect::kR_ChannelSelectorType,

SkDisplacementMapEffect::kA_ChannelSelectorType,

- 64.0f, displ, NULL, &cropRect))->unref();

+ 64.0f, displ, nullptr, &cropRect))->unref();

drawClippedBitmap(canvas, 400, 200, paint);

paint.setImageFilter(SkDisplacementMapEffect::Create(

SkDisplacementMapEffect::kR_ChannelSelectorType,

SkDisplacementMapEffect::kG_ChannelSelectorType,

- 40.0f, displ, NULL, &cropRect))->unref();

+ 40.0f, displ, nullptr, &cropRect))->unref();

drawClippedBitmap(canvas, 0, 300, paint);

paint.setImageFilter(SkDisplacementMapEffect::Create(

SkDisplacementMapEffect::kB_ChannelSelectorType,

SkDisplacementMapEffect::kA_ChannelSelectorType,

- 40.0f, displ, NULL, &cropRect))->unref();

+ 40.0f, displ, nullptr, &cropRect))->unref();

drawClippedBitmap(canvas, 100, 300, paint);

paint.setImageFilter(SkDisplacementMapEffect::Create(

SkDisplacementMapEffect::kR_ChannelSelectorType,

SkDisplacementMapEffect::kB_ChannelSelectorType,

- 40.0f, displ, NULL, &cropRect))->unref();

+ 40.0f, displ, nullptr, &cropRect))->unref();

drawClippedBitmap(canvas, 200, 300, paint);

paint.setImageFilter(SkDisplacementMapEffect::Create(

SkDisplacementMapEffect::kG_ChannelSelectorType,

SkDisplacementMapEffect::kA_ChannelSelectorType,

- 40.0f, displ, NULL, &cropRect))->unref();

+ 40.0f, displ, nullptr, &cropRect))->unref();

drawClippedBitmap(canvas, 300, 300, paint);

paint.setImageFilter(SkDisplacementMapEffect::Create(

SkDisplacementMapEffect::kR_ChannelSelectorType,

SkDisplacementMapEffect::kA_ChannelSelectorType,

- 40.0f, displ, NULL, &cropRect))->unref();

+ 40.0f, displ, nullptr, &cropRect))->unref();

drawClippedBitmap(canvas, 400, 300, paint);

// Tests for images of different sizes

@@ -199,7 +199,7 @@ protected:

paint.setImageFilter(SkDisplacementMapEffect::Create(

SkDisplacementMapEffect::kG_ChannelSelectorType,

SkDisplacementMapEffect::kA_ChannelSelectorType,

- 40.0f, NULL))->unref();

+ 40.0f, nullptr))->unref();

drawClippedBitmap(canvas, 400, 400, paint);

}

« no previous file with comments | « gm/discard.cpp ('k') | gm/distantclip.cpp » ('j') | no next file with comments »