src/sfnt/SkOTUtils.cpp - Issue 798723002: More win64 warning fixes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/sfnt/SkOTUtils.cpp

Issue 798723002: More win64 warning fixes (Closed) Base URL: https://skia.googlesource.com/skia.git@size_t

Patch Set: off_t is signed Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/sfnt/SkOTUtils.cpp

diff --git a/src/sfnt/SkOTUtils.cpp b/src/sfnt/SkOTUtils.cpp

index 0e009528b4dcd1aa14f70a22f611cdd684ee3088..1d3843d061a043adb46a525cbcd718212cd45118 100644

--- a/src/sfnt/SkOTUtils.cpp

+++ b/src/sfnt/SkOTUtils.cpp

@@ -129,7 +129,7 @@ SkData* SkOTUtils::RenameFont(SkStream* fontData, const char* fontName, int font

nameRecords[i].languageID.windows.value = SkOTTableName::Record::LanguageID::Windows::English_UnitedStates;

nameRecords[i].nameID.predefined.value = namesToCreate[i];

nameRecords[i].offset = SkEndian_SwapBE16(0);

- nameRecords[i].length = SkEndian_SwapBE16(fontNameLen * sizeof(wchar_t));

+ nameRecords[i].length = SkEndian_SwapBE16(SkToU16(fontNameLen * sizeof(wchar_t)));

}

SK_OT_USHORT* nameString = reinterpret_cast<SK_OT_USHORT*>(data + originalDataSize + stringOffset);

« no previous file with comments | « src/pdf/SkPDFDocument.cpp ('k') | no next file » | no next file with comments »