Index: samplecode/SampleFontScalerTest.cpp |
diff --git a/samplecode/SampleFontScalerTest.cpp b/samplecode/SampleFontScalerTest.cpp |
index bbfd5a5e147da10b5fba438e9ed35ccefa108f5c..0105a47346e54c4198b1e87b59e638806c10c9f9 100644 |
--- a/samplecode/SampleFontScalerTest.cpp |
+++ b/samplecode/SampleFontScalerTest.cpp |
@@ -25,8 +25,8 @@ static const struct { |
const char* fName; |
SkTypeface::Style fStyle; |
} gFaces[] = { |
- { NULL, SkTypeface::kNormal }, |
- { NULL, SkTypeface::kBold }, |
+ { nullptr, SkTypeface::kNormal }, |
+ { nullptr, SkTypeface::kBold }, |
{ "serif", SkTypeface::kNormal }, |
{ "serif", SkTypeface::kBold }, |
{ "serif", SkTypeface::kItalic }, |
@@ -121,7 +121,7 @@ protected: |
for (int ps = 6; ps <= 22; ps++) { |
paint.setTextSize(SkIntToScalar(ps)); |
canvas->drawText(text, textLen, x, y, paint); |
- y += paint.getFontMetrics(NULL); |
+ y += paint.getFontMetrics(nullptr); |
index += 1; |
} |
} |