Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(633)

Side by Side 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:
View unified diff | Download patch
« no previous file with comments | « src/pdf/SkPDFDocument.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkData.h" 8 #include "SkData.h"
9 #include "SkEndian.h" 9 #include "SkEndian.h"
10 #include "SkSFNTHeader.h" 10 #include "SkSFNTHeader.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 nameTable->count = SkEndian_SwapBE16(namesCount); 122 nameTable->count = SkEndian_SwapBE16(namesCount);
123 nameTable->stringOffset = SkEndian_SwapBE16(stringOffset); 123 nameTable->stringOffset = SkEndian_SwapBE16(stringOffset);
124 124
125 SkOTTableName::Record* nameRecords = reinterpret_cast<SkOTTableName::Record* >(data + originalDataSize + sizeof(SkOTTableName)); 125 SkOTTableName::Record* nameRecords = reinterpret_cast<SkOTTableName::Record* >(data + originalDataSize + sizeof(SkOTTableName));
126 for (int i = 0; i < namesCount; ++i) { 126 for (int i = 0; i < namesCount; ++i) {
127 nameRecords[i].platformID.value = SkOTTableName::Record::PlatformID::Win dows; 127 nameRecords[i].platformID.value = SkOTTableName::Record::PlatformID::Win dows;
128 nameRecords[i].encodingID.windows.value = SkOTTableName::Record::Encodin gID::Windows::UnicodeBMPUCS2; 128 nameRecords[i].encodingID.windows.value = SkOTTableName::Record::Encodin gID::Windows::UnicodeBMPUCS2;
129 nameRecords[i].languageID.windows.value = SkOTTableName::Record::Languag eID::Windows::English_UnitedStates; 129 nameRecords[i].languageID.windows.value = SkOTTableName::Record::Languag eID::Windows::English_UnitedStates;
130 nameRecords[i].nameID.predefined.value = namesToCreate[i]; 130 nameRecords[i].nameID.predefined.value = namesToCreate[i];
131 nameRecords[i].offset = SkEndian_SwapBE16(0); 131 nameRecords[i].offset = SkEndian_SwapBE16(0);
132 nameRecords[i].length = SkEndian_SwapBE16(fontNameLen * sizeof(wchar_t)) ; 132 nameRecords[i].length = SkEndian_SwapBE16(SkToU16(fontNameLen * sizeof(w char_t)));
133 } 133 }
134 134
135 SK_OT_USHORT* nameString = reinterpret_cast<SK_OT_USHORT*>(data + originalDa taSize + stringOffset); 135 SK_OT_USHORT* nameString = reinterpret_cast<SK_OT_USHORT*>(data + originalDa taSize + stringOffset);
136 for (int i = 0; i < fontNameLen; ++i) { 136 for (int i = 0; i < fontNameLen; ++i) {
137 nameString[i] = SkEndian_SwapBE16(fontName[i]); 137 nameString[i] = SkEndian_SwapBE16(fontName[i]);
138 } 138 }
139 139
140 unsigned char* logical = data + originalDataSize + nameTableLogicalSize; 140 unsigned char* logical = data + originalDataSize + nameTableLogicalSize;
141 unsigned char* physical = data + originalDataSize + nameTablePhysicalSize; 141 unsigned char* physical = data + originalDataSize + nameTablePhysicalSize;
142 for (; logical < physical; ++logical) { 142 for (; logical < physical; ++logical) {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 fFamilyNameIter.reset(fTypes[fTypesIndex]); 194 fFamilyNameIter.reset(fTypes[fTypesIndex]);
195 } while (true); 195 } while (true);
196 } 196 }
197 197
198 SkOTTableName::Record::NameID::Predefined::Value 198 SkOTTableName::Record::NameID::Predefined::Value
199 SkOTUtils::LocalizedStrings_NameTable::familyNameTypes[3] = { 199 SkOTUtils::LocalizedStrings_NameTable::familyNameTypes[3] = {
200 SkOTTableName::Record::NameID::Predefined::FontFamilyName, 200 SkOTTableName::Record::NameID::Predefined::FontFamilyName,
201 SkOTTableName::Record::NameID::Predefined::PreferredFamily, 201 SkOTTableName::Record::NameID::Predefined::PreferredFamily,
202 SkOTTableName::Record::NameID::Predefined::WWSFamilyName, 202 SkOTTableName::Record::NameID::Predefined::WWSFamilyName,
203 }; 203 };
OLDNEW
« no previous file with comments | « src/pdf/SkPDFDocument.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698