diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-23 19:19:44 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-23 19:19:44 +0000 |
| commit | f117781362ecf673f43f93918781853690f0e145 (patch) | |
| tree | f6be20d37ac41564b878b11a5cd86a64d76714c5 /src/sfnt | |
| parent | edbd6ae92e8bc2431ec2f97d6e0d02c9c74c3e7f (diff) | |
fix size_t/int warnings
BUG=skia:
R=mtklein@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/247753003
git-svn-id: http://skia.googlecode.com/svn/trunk@14332 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/sfnt')
| -rw-r--r-- | src/sfnt/SkOTUtils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sfnt/SkOTUtils.cpp b/src/sfnt/SkOTUtils.cpp index 004a888310..e76d1da08c 100644 --- a/src/sfnt/SkOTUtils.cpp +++ b/src/sfnt/SkOTUtils.cpp @@ -103,7 +103,7 @@ SkData* SkOTUtils::RenameFont(SkStream* fontData, const char* fontName, int font for (; currentEntry < endEntry; ++currentEntry) { uint32_t oldOffset = SkEndian_SwapBE32(currentEntry->offset); if (oldOffset > oldNameTableOffset) { - currentEntry->offset = SkEndian_SwapBE32(oldOffset - oldNameTablePhysicalSize); + currentEntry->offset = SkEndian_SwapBE32(SkToU32(oldOffset - oldNameTablePhysicalSize)); } if (SkOTTableHead::TAG == currentEntry->tag) { headTableEntry = currentEntry; @@ -112,8 +112,8 @@ SkData* SkOTUtils::RenameFont(SkStream* fontData, const char* fontName, int font // Make the table directory entry point to the new 'name' table. SkSFNTHeader::TableDirectoryEntry* nameTableEntry = reinterpret_cast<SkSFNTHeader::TableDirectoryEntry*>(data + sizeof(SkSFNTHeader)) + tableIndex; - nameTableEntry->logicalLength = SkEndian_SwapBE32(nameTableLogicalSize); - nameTableEntry->offset = SkEndian_SwapBE32(originalDataSize); + nameTableEntry->logicalLength = SkEndian_SwapBE32(SkToU32(nameTableLogicalSize)); + nameTableEntry->offset = SkEndian_SwapBE32(SkToU32(originalDataSize)); // Write the new 'name' table after the original font data. SkOTTableName* nameTable = reinterpret_cast<SkOTTableName*>(data + originalDataSize); |