| Index: gm/textblobshader.cpp
|
| diff --git a/gm/textblobshader.cpp b/gm/textblobshader.cpp
|
| index 5c9372d93cdb085edb0590a0afd39bd097307660..30674e1d6877521c3595ffa94fc3775bdc7ff9d3 100644
|
| --- a/gm/textblobshader.cpp
|
| +++ b/gm/textblobshader.cpp
|
| @@ -22,7 +22,7 @@ public:
|
| SkPaint p;
|
| sk_tool_utils::set_portable_typeface(&p);
|
| size_t txtLen = strlen(txt);
|
| - fGlyphs.append(p.textToGlyphs(txt, txtLen, NULL));
|
| + fGlyphs.append(p.textToGlyphs(txt, txtLen, nullptr));
|
| p.textToGlyphs(txt, txtLen, fGlyphs.begin());
|
| }
|
|
|
| @@ -40,16 +40,16 @@ protected:
|
| int glyphCount = fGlyphs.count();
|
| const SkTextBlobBuilder::RunBuffer* run;
|
|
|
| - run = &builder.allocRun(p, glyphCount, 10, 10, NULL);
|
| + run = &builder.allocRun(p, glyphCount, 10, 10, nullptr);
|
| memcpy(run->glyphs, fGlyphs.begin(), glyphCount * sizeof(uint16_t));
|
|
|
| - run = &builder.allocRunPosH(p, glyphCount, 80, NULL);
|
| + run = &builder.allocRunPosH(p, glyphCount, 80, nullptr);
|
| memcpy(run->glyphs, fGlyphs.begin(), glyphCount * sizeof(uint16_t));
|
| for (int i = 0; i < glyphCount; ++i) {
|
| run->pos[i] = p.getTextSize() * i * .75f;
|
| }
|
|
|
| - run = &builder.allocRunPos(p, glyphCount, NULL);
|
| + run = &builder.allocRunPos(p, glyphCount, nullptr);
|
| memcpy(run->glyphs, fGlyphs.begin(), glyphCount * sizeof(uint16_t));
|
| for (int i = 0; i < glyphCount; ++i) {
|
| run->pos[i * 2] = p.getTextSize() * i * .75f;
|
|
|