| Index: tools/create_test_font.cpp
|
| diff --git a/tools/create_test_font.cpp b/tools/create_test_font.cpp
|
| index 9193ba257e2bfd864d2eadc4ce510d8d7cfa4c8a..1de08ac0381c198492ceb75ba566a6a1b23d3b74 100644
|
| --- a/tools/create_test_font.cpp
|
| +++ b/tools/create_test_font.cpp
|
| @@ -327,7 +327,7 @@ static int written_index(const FontDesc& fontDesc) {
|
| }
|
|
|
| static void generate_fonts() {
|
| - FILE* out = NULL;
|
| + FILE* out = nullptr;
|
| for (int index = 0; index < gFontsCount; ++index) {
|
| FontDesc& fontDesc = gFonts[index];
|
| if ((index & 3) == 0) {
|
| @@ -391,7 +391,7 @@ static void generate_index(const char* defaultName) {
|
| fprintf(out,
|
| " { %sPoints, %sVerbs, %sCharCodes,\n"
|
| " %sCharCodesCount, %sWidths,\n"
|
| - " %sMetrics, \"Toy %s\", SkTypeface::k%s, NULL\n"
|
| + " %sMetrics, \"Toy %s\", SkTypeface::k%s, nullptr\n"
|
| " },\n",
|
| strip, strip, strip, strip, strip, strip, name, gStyleName[writ.fStyle]);
|
| }
|
|
|