| Index: samplecode/SampleHT.cpp
|
| diff --git a/samplecode/SampleHT.cpp b/samplecode/SampleHT.cpp
|
| index 7b452505a40ce1db3396fdd25781b22e8727be33..099adcc948db86733e6defd69f655c614c8ee93e 100644
|
| --- a/samplecode/SampleHT.cpp
|
| +++ b/samplecode/SampleHT.cpp
|
| @@ -54,7 +54,7 @@ public:
|
| fR = SkRect::MakeXYWH(rand.nextRangeF(0, 640), rand.nextRangeF(0, 480),
|
| rand.nextRangeF(20, 200), rand.nextRangeF(20, 200));
|
| fColor = rand_opaque_color(rand.nextU());
|
| - fInterp = NULL;
|
| + fInterp = nullptr;
|
| fTime = 0;
|
| }
|
|
|
| @@ -102,7 +102,7 @@ public:
|
| switch (res) {
|
| case SkInterpolator::kFreezeEnd_Result:
|
| delete fInterp;
|
| - fInterp = NULL;
|
| + fInterp = nullptr;
|
| break;
|
| default:
|
| break;
|
| @@ -172,8 +172,8 @@ protected:
|
| break;
|
| }
|
| }
|
| - this->inval(NULL);
|
| - return NULL;
|
| + this->inval(nullptr);
|
| + return nullptr;
|
| }
|
|
|
| private:
|
|
|