diff options
author | halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/sfnt/SkOTUtils.cpp | |
parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'src/sfnt/SkOTUtils.cpp')
-rw-r--r-- | src/sfnt/SkOTUtils.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/sfnt/SkOTUtils.cpp b/src/sfnt/SkOTUtils.cpp index fb82182130..52d996fbc5 100644 --- a/src/sfnt/SkOTUtils.cpp +++ b/src/sfnt/SkOTUtils.cpp @@ -38,7 +38,7 @@ SkData* SkOTUtils::RenameFont(SkStreamAsset* fontData, const char* fontName, int // Get the sfnt header. SkSFNTHeader sfntHeader; if (fontData->read(&sfntHeader, sizeof(sfntHeader)) < sizeof(sfntHeader)) { - return NULL; + return nullptr; } // Find the existing 'name' table. @@ -47,18 +47,18 @@ SkData* SkOTUtils::RenameFont(SkStreamAsset* fontData, const char* fontName, int int numTables = SkEndian_SwapBE16(sfntHeader.numTables); for (tableIndex = 0; tableIndex < numTables; ++tableIndex) { if (fontData->read(&tableEntry, sizeof(tableEntry)) < sizeof(tableEntry)) { - return NULL; + return nullptr; } if (SkOTTableName::TAG == tableEntry.tag) { break; } } if (tableIndex == numTables) { - return NULL; + return nullptr; } if (!fontData->rewind()) { - return NULL; + return nullptr; } // The required 'name' record types: Family, Style, Unique, Full and PostScript. @@ -87,19 +87,19 @@ SkData* SkOTUtils::RenameFont(SkStreamAsset* fontData, const char* fontName, int SK_OT_BYTE* data = static_cast<SK_OT_BYTE*>(rewrittenFontData->writable_data()); if (fontData->read(data, oldNameTableOffset) < oldNameTableOffset) { - return NULL; + return nullptr; } if (fontData->skip(oldNameTablePhysicalSize) < oldNameTablePhysicalSize) { - return NULL; + return nullptr; } if (fontData->read(data + oldNameTableOffset, originalDataSize - oldNameTableOffset) < originalDataSize - oldNameTableOffset) { - return NULL; + return nullptr; } //Fix up the offsets of the directory entries after the old 'name' table entry. SkSFNTHeader::TableDirectoryEntry* currentEntry = reinterpret_cast<SkSFNTHeader::TableDirectoryEntry*>(data + sizeof(SkSFNTHeader)); SkSFNTHeader::TableDirectoryEntry* endEntry = currentEntry + numTables; - SkSFNTHeader::TableDirectoryEntry* headTableEntry = NULL; + SkSFNTHeader::TableDirectoryEntry* headTableEntry = nullptr; for (; currentEntry < endEntry; ++currentEntry) { uint32_t oldOffset = SkEndian_SwapBE32(currentEntry->offset); if (oldOffset > oldNameTableOffset) { @@ -166,12 +166,12 @@ SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(const SkTypeface& ty static const SkFontTableTag nameTag = SkSetFourByteTag('n','a','m','e'); size_t nameTableSize = typeface.getTableSize(nameTag); if (0 == nameTableSize) { - return NULL; + return nullptr; } SkAutoTDeleteArray<uint8_t> nameTableData(new uint8_t[nameTableSize]); size_t copied = typeface.getTableData(nameTag, 0, nameTableSize, nameTableData.get()); if (copied != nameTableSize) { - return NULL; + return nullptr; } return new SkOTUtils::LocalizedStrings_NameTable((SkOTTableName*)nameTableData.detach(), |