aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/textblobshader.cpp
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-08-27 07:41:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-27 07:41:16 -0700
commit96fcdcc219d2a0d3579719b84b28bede76efba64 (patch)
tree0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /gm/textblobshader.cpp
parent435af2f736c85c3274a0c6760a3523810750d237 (diff)
Style Change: NULL->nullptr
Diffstat (limited to 'gm/textblobshader.cpp')
-rw-r--r--gm/textblobshader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/textblobshader.cpp b/gm/textblobshader.cpp
index 5c9372d93c..30674e1d68 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;