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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: src/sfnt/SkOTTable_OS_2_V2.h

Issue 189093020: Fix (1 << 31) to (1u << 31) in SkOTTable_OS_2. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Pedantic Created 6 years, 9 months 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 | Annotate | Revision Log
« no previous file with comments | « src/sfnt/SkOTTable_OS_2_V1.h ('k') | src/sfnt/SkOTTable_OS_2_V3.h » ('j') | 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 #ifndef SkOTTable_OS_2_V2_DEFINED 8 #ifndef SkOTTable_OS_2_V2_DEFINED
9 #define SkOTTable_OS_2_V2_DEFINED 9 #define SkOTTable_OS_2_V2_DEFINED
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 Reserved00, 66 Reserved00,
67 Restricted, 67 Restricted,
68 PreviewPrint, 68 PreviewPrint,
69 Editable, 69 Editable,
70 Reserved04, 70 Reserved04,
71 Reserved05, 71 Reserved05,
72 Reserved06, 72 Reserved06,
73 Reserved07) 73 Reserved07)
74 } field; 74 } field;
75 struct Raw { 75 struct Raw {
76 static const SK_OT_USHORT Installable = SkTEndian_SwapBE16(0); 76 static const SK_OT_USHORT Installable = 0;
77 static const SK_OT_USHORT RestrictedMask = SkTEndian_SwapBE16(1 << 1 ); 77 static const SK_OT_USHORT RestrictedMask = SkOTSetUSHORTBit<1>::valu e;
78 static const SK_OT_USHORT PreviewPrintMask = SkTEndian_SwapBE16(1 << 2); 78 static const SK_OT_USHORT PreviewPrintMask = SkOTSetUSHORTBit<2>::va lue;
79 static const SK_OT_USHORT EditableMask = SkTEndian_SwapBE16(1 << 3); 79 static const SK_OT_USHORT EditableMask = SkOTSetUSHORTBit<3>::value;
80 static const SK_OT_USHORT NoSubsettingMask = SkTEndian_SwapBE16(1 << 8); 80 static const SK_OT_USHORT NoSubsettingMask = SkOTSetUSHORTBit<8>::va lue;
81 static const SK_OT_USHORT BitmapMask = SkTEndian_SwapBE16(1 << 9); 81 static const SK_OT_USHORT BitmapMask = SkOTSetUSHORTBit<9>::value;
82 SK_OT_USHORT value; 82 SK_OT_USHORT value;
83 } raw; 83 } raw;
84 } fsType; 84 } fsType;
85 SK_OT_SHORT ySubscriptXSize; 85 SK_OT_SHORT ySubscriptXSize;
86 SK_OT_SHORT ySubscriptYSize; 86 SK_OT_SHORT ySubscriptYSize;
87 SK_OT_SHORT ySubscriptXOffset; 87 SK_OT_SHORT ySubscriptXOffset;
88 SK_OT_SHORT ySubscriptYOffset; 88 SK_OT_SHORT ySubscriptYOffset;
89 SK_OT_SHORT ySuperscriptXSize; 89 SK_OT_SHORT ySuperscriptXSize;
90 SK_OT_SHORT ySuperscriptYSize; 90 SK_OT_SHORT ySuperscriptYSize;
91 SK_OT_SHORT ySuperscriptXOffset; 91 SK_OT_SHORT ySuperscriptXOffset;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 Reserved097, 255 Reserved097,
256 Reserved098, 256 Reserved098,
257 Reserved099, 257 Reserved099,
258 Reserved100, 258 Reserved100,
259 Reserved101, 259 Reserved101,
260 Reserved102, 260 Reserved102,
261 Reserved103) 261 Reserved103)
262 } field; 262 } field;
263 struct Raw { 263 struct Raw {
264 struct l0 { 264 struct l0 {
265 static const SK_OT_ULONG BasicLatinMask = SkTEndian_SwapBE32(1 < < 0); 265 static const SK_OT_ULONG BasicLatinMask = SkOTSetULONGBit<0>::va lue;
266 static const SK_OT_ULONG Latin1SupplementMask = SkTEndian_SwapBE 32(1 << 1); 266 static const SK_OT_ULONG Latin1SupplementMask = SkOTSetULONGBit< 1>::value;
267 static const SK_OT_ULONG LatinExtendedAMask = SkTEndian_SwapBE32 (1 << 2); 267 static const SK_OT_ULONG LatinExtendedAMask = SkOTSetULONGBit<2> ::value;
268 static const SK_OT_ULONG LatinExtendedBMask = SkTEndian_SwapBE32 (1 << 3); 268 static const SK_OT_ULONG LatinExtendedBMask = SkOTSetULONGBit<3> ::value;
269 static const SK_OT_ULONG IPAExtensionsMask = SkTEndian_SwapBE32( 1 << 4); 269 static const SK_OT_ULONG IPAExtensionsMask = SkOTSetULONGBit<4>: :value;
270 static const SK_OT_ULONG SpacingModifierLettersMask = SkTEndian_ SwapBE32(1 << 5); 270 static const SK_OT_ULONG SpacingModifierLettersMask = SkOTSetULO NGBit<5>::value;
271 static const SK_OT_ULONG CombiningDiacriticalMarksMask = SkTEndi an_SwapBE32(1 << 6); 271 static const SK_OT_ULONG CombiningDiacriticalMarksMask = SkOTSet ULONGBit<6>::value;
272 static const SK_OT_ULONG GreekMask = SkTEndian_SwapBE32(1 << 7); 272 static const SK_OT_ULONG GreekMask = SkOTSetULONGBit<7>::value;
273 //Reserved 273 //Reserved
274 static const SK_OT_ULONG CyrillicMask = SkTEndian_SwapBE32(1 << 9); 274 static const SK_OT_ULONG CyrillicMask = SkOTSetULONGBit<9>::valu e;
275 static const SK_OT_ULONG ArmenianMask = SkTEndian_SwapBE32(1 << 10); 275 static const SK_OT_ULONG ArmenianMask = SkOTSetULONGBit<10>::val ue;
276 static const SK_OT_ULONG HebrewMask = SkTEndian_SwapBE32(1 << 11 ); 276 static const SK_OT_ULONG HebrewMask = SkOTSetULONGBit<11>::value ;
277 //Reserved 277 //Reserved
278 static const SK_OT_ULONG ArabicMask = SkTEndian_SwapBE32(1 << 13 ); 278 static const SK_OT_ULONG ArabicMask = SkOTSetULONGBit<13>::value ;
279 //Reserved 279 //Reserved
280 static const SK_OT_ULONG DevanagariMask = SkTEndian_SwapBE32(1 < < 15); 280 static const SK_OT_ULONG DevanagariMask = SkOTSetULONGBit<15>::v alue;
281 static const SK_OT_ULONG BengaliMask = SkTEndian_SwapBE32(1 << 1 6); 281 static const SK_OT_ULONG BengaliMask = SkOTSetULONGBit<16>::valu e;
282 static const SK_OT_ULONG GurmukhiMask = SkTEndian_SwapBE32(1 << 17); 282 static const SK_OT_ULONG GurmukhiMask = SkOTSetULONGBit<17>::val ue;
283 static const SK_OT_ULONG GujaratiMask = SkTEndian_SwapBE32(1 << 18); 283 static const SK_OT_ULONG GujaratiMask = SkOTSetULONGBit<18>::val ue;
284 static const SK_OT_ULONG OriyaMask = SkTEndian_SwapBE32(1 << 19) ; 284 static const SK_OT_ULONG OriyaMask = SkOTSetULONGBit<19>::value;
285 static const SK_OT_ULONG TamilMask = SkTEndian_SwapBE32(1 << 20) ; 285 static const SK_OT_ULONG TamilMask = SkOTSetULONGBit<20>::value;
286 static const SK_OT_ULONG TeluguMask = SkTEndian_SwapBE32(1 << 21 ); 286 static const SK_OT_ULONG TeluguMask = SkOTSetULONGBit<21>::value ;
287 static const SK_OT_ULONG KannadaMask = SkTEndian_SwapBE32(1 << 2 2); 287 static const SK_OT_ULONG KannadaMask = SkOTSetULONGBit<22>::valu e;
288 static const SK_OT_ULONG MalayalamMask = SkTEndian_SwapBE32(1 << 23); 288 static const SK_OT_ULONG MalayalamMask = SkOTSetULONGBit<23>::va lue;
289 static const SK_OT_ULONG ThaiMask = SkTEndian_SwapBE32(1 << 24); 289 static const SK_OT_ULONG ThaiMask = SkOTSetULONGBit<24>::value;
290 static const SK_OT_ULONG LaoMask = SkTEndian_SwapBE32(1 << 25); 290 static const SK_OT_ULONG LaoMask = SkOTSetULONGBit<25>::value;
291 static const SK_OT_ULONG GeorgianMask = SkTEndian_SwapBE32(1 << 26); 291 static const SK_OT_ULONG GeorgianMask = SkOTSetULONGBit<26>::val ue;
292 //Reserved 292 //Reserved
293 static const SK_OT_ULONG HangulJamoMask = SkTEndian_SwapBE32(1 < < 28); 293 static const SK_OT_ULONG HangulJamoMask = SkOTSetULONGBit<28>::v alue;
294 static const SK_OT_ULONG LatinExtendedAdditionalMask = SkTEndian _SwapBE32(1 << 29); 294 static const SK_OT_ULONG LatinExtendedAdditionalMask = SkOTSetUL ONGBit<29>::value;
295 static const SK_OT_ULONG GreekExtendedMask = SkTEndian_SwapBE32( 1 << 30); 295 static const SK_OT_ULONG GreekExtendedMask = SkOTSetULONGBit<30> ::value;
296 static const SK_OT_ULONG GeneralPunctuationMask = SkTEndian_Swap BE32(1 << 31); 296 static const SK_OT_ULONG GeneralPunctuationMask = SkOTSetULONGBi t<31>::value;
297 }; 297 };
298 struct l1 { 298 struct l1 {
299 static const SK_OT_ULONG SuperscriptsAndSubscriptsMask = SkTEndi an_SwapBE32(1 << (32 - 32)); 299 static const SK_OT_ULONG SuperscriptsAndSubscriptsMask = SkOTSet ULONGBit<32 - 32>::value;
300 static const SK_OT_ULONG CurrencySymbolsMask = SkTEndian_SwapBE3 2(1 << (33 - 32)); 300 static const SK_OT_ULONG CurrencySymbolsMask = SkOTSetULONGBit<3 3 - 32>::value;
301 static const SK_OT_ULONG CombiningDiacriticalMarksForSymbolsMask = SkTEndian_SwapBE32(1 << (34 - 32)); 301 static const SK_OT_ULONG CombiningDiacriticalMarksForSymbolsMask = SkOTSetULONGBit<34 - 32>::value;
302 static const SK_OT_ULONG LetterlikeSymbolsMask = SkTEndian_SwapB E32(1 << (35 - 32)); 302 static const SK_OT_ULONG LetterlikeSymbolsMask = SkOTSetULONGBit <35 - 32>::value;
303 static const SK_OT_ULONG NumberFormsMask = SkTEndian_SwapBE32(1 << (36 - 32)); 303 static const SK_OT_ULONG NumberFormsMask = SkOTSetULONGBit<36 - 32>::value;
304 static const SK_OT_ULONG ArrowsMask = SkTEndian_SwapBE32(1 << (3 7 - 32)); 304 static const SK_OT_ULONG ArrowsMask = SkOTSetULONGBit<37 - 32>:: value;
305 static const SK_OT_ULONG MathematicalOperatorsMask = SkTEndian_S wapBE32(1 << (38 - 32)); 305 static const SK_OT_ULONG MathematicalOperatorsMask = SkOTSetULON GBit<38 - 32>::value;
306 static const SK_OT_ULONG MiscellaneousTechnicalMask = SkTEndian_ SwapBE32(1 << (39 - 32)); 306 static const SK_OT_ULONG MiscellaneousTechnicalMask = SkOTSetULO NGBit<39 - 32>::value;
307 static const SK_OT_ULONG ControlPicturesMask = SkTEndian_SwapBE3 2(1 << (40 - 32)); 307 static const SK_OT_ULONG ControlPicturesMask = SkOTSetULONGBit<4 0 - 32>::value;
308 static const SK_OT_ULONG OpticalCharacterRecognitionMask = SkTEn dian_SwapBE32(1 << (41 - 32)); 308 static const SK_OT_ULONG OpticalCharacterRecognitionMask = SkOTS etULONGBit<41 - 32>::value;
309 static const SK_OT_ULONG EnclosedAlphanumericsMask = SkTEndian_S wapBE32(1 << (42 - 32)); 309 static const SK_OT_ULONG EnclosedAlphanumericsMask = SkOTSetULON GBit<42 - 32>::value;
310 static const SK_OT_ULONG BoxDrawingMask = SkTEndian_SwapBE32(1 < < (43 - 32)); 310 static const SK_OT_ULONG BoxDrawingMask = SkOTSetULONGBit<43 - 3 2>::value;
311 static const SK_OT_ULONG BlockElementsMask = SkTEndian_SwapBE32( 1 << (44 - 32)); 311 static const SK_OT_ULONG BlockElementsMask = SkOTSetULONGBit<44 - 32>::value;
312 static const SK_OT_ULONG GeometricShapesMask = SkTEndian_SwapBE3 2(1 << (45 - 32)); 312 static const SK_OT_ULONG GeometricShapesMask = SkOTSetULONGBit<4 5 - 32>::value;
313 static const SK_OT_ULONG MiscellaneousSymbolsMask = SkTEndian_Sw apBE32(1 << (46 - 32)); 313 static const SK_OT_ULONG MiscellaneousSymbolsMask = SkOTSetULONG Bit<46 - 32>::value;
314 static const SK_OT_ULONG DingbatsMask = SkTEndian_SwapBE32(1 << (47 - 32)); 314 static const SK_OT_ULONG DingbatsMask = SkOTSetULONGBit<47 - 32> ::value;
315 static const SK_OT_ULONG CJKSymbolsAndPunctuationMask = SkTEndia n_SwapBE32(1 << (48 - 32)); 315 static const SK_OT_ULONG CJKSymbolsAndPunctuationMask = SkOTSetU LONGBit<48 - 32>::value;
316 static const SK_OT_ULONG HiraganaMask = SkTEndian_SwapBE32(1 << (49 - 32)); 316 static const SK_OT_ULONG HiraganaMask = SkOTSetULONGBit<49 - 32> ::value;
317 static const SK_OT_ULONG KatakanaMask = SkTEndian_SwapBE32(1 << (50 - 32)); 317 static const SK_OT_ULONG KatakanaMask = SkOTSetULONGBit<50 - 32> ::value;
318 static const SK_OT_ULONG BopomofoMask = SkTEndian_SwapBE32(1 << (51 - 32)); 318 static const SK_OT_ULONG BopomofoMask = SkOTSetULONGBit<51 - 32> ::value;
319 static const SK_OT_ULONG HangulCompatibilityJamoMask = SkTEndian _SwapBE32(1 << (52 - 32)); 319 static const SK_OT_ULONG HangulCompatibilityJamoMask = SkOTSetUL ONGBit<52 - 32>::value;
320 static const SK_OT_ULONG CJKMiscellaneousMask = SkTEndian_SwapBE 32(1 << (53 - 32)); 320 static const SK_OT_ULONG CJKMiscellaneousMask = SkOTSetULONGBit< 53 - 32>::value;
321 static const SK_OT_ULONG EnclosedCJKLettersAndMonthsMask = SkTEn dian_SwapBE32(1 << (54 - 32)); 321 static const SK_OT_ULONG EnclosedCJKLettersAndMonthsMask = SkOTS etULONGBit<54 - 32>::value;
322 static const SK_OT_ULONG CJKCompatibilityMask = SkTEndian_SwapBE 32(1 << (55 - 32)); 322 static const SK_OT_ULONG CJKCompatibilityMask = SkOTSetULONGBit< 55 - 32>::value;
323 static const SK_OT_ULONG HangulMask = SkTEndian_SwapBE32(1 << (5 6 - 32)); 323 static const SK_OT_ULONG HangulMask = SkOTSetULONGBit<56 - 32>:: value;
324 static const SK_OT_ULONG SurrogatesMask = SkTEndian_SwapBE32(1 < < (57 - 32)); 324 static const SK_OT_ULONG SurrogatesMask = SkOTSetULONGBit<57 - 3 2>::value;
325 //Reserved 325 //Reserved
326 static const SK_OT_ULONG CJKUnifiedIdeographsMask = SkTEndian_Sw apBE32(1 << (59 - 32)); 326 static const SK_OT_ULONG CJKUnifiedIdeographsMask = SkOTSetULONG Bit<59 - 32>::value;
327 static const SK_OT_ULONG PrivateUseAreaMask = SkTEndian_SwapBE32 (1 << (60 - 32)); 327 static const SK_OT_ULONG PrivateUseAreaMask = SkOTSetULONGBit<60 - 32>::value;
328 static const SK_OT_ULONG CJKCompatibilityIdeographsMask = SkTEnd ian_SwapBE32(1 << (61 - 32)); 328 static const SK_OT_ULONG CJKCompatibilityIdeographsMask = SkOTSe tULONGBit<61 - 32>::value;
329 static const SK_OT_ULONG AlphabeticPresentationFormsMask = SkTEn dian_SwapBE32(1 << (62 - 32)); 329 static const SK_OT_ULONG AlphabeticPresentationFormsMask = SkOTS etULONGBit<62 - 32>::value;
330 static const SK_OT_ULONG ArabicPresentationFormsAMask = SkTEndia n_SwapBE32(1 << (63 - 32)); 330 static const SK_OT_ULONG ArabicPresentationFormsAMask = SkOTSetU LONGBit<63 - 32>::value;
331 }; 331 };
332 struct l2 { 332 struct l2 {
333 static const SK_OT_ULONG CombiningHalfMarksMask = SkTEndian_Swap BE32(1 << (64 - 64)); 333 static const SK_OT_ULONG CombiningHalfMarksMask = SkOTSetULONGBi t<64 - 64>::value;
334 static const SK_OT_ULONG CJKCompatibilityFormsMask = SkTEndian_S wapBE32(1 << (65 - 64)); 334 static const SK_OT_ULONG CJKCompatibilityFormsMask = SkOTSetULON GBit<65 - 64>::value;
335 static const SK_OT_ULONG SmallFormVariantsMask = SkTEndian_SwapB E32(1 << (66 - 64)); 335 static const SK_OT_ULONG SmallFormVariantsMask = SkOTSetULONGBit <66 - 64>::value;
336 static const SK_OT_ULONG ArabicPresentationFormsBMask = SkTEndia n_SwapBE32(1 << (67 - 64)); 336 static const SK_OT_ULONG ArabicPresentationFormsBMask = SkOTSetU LONGBit<67 - 64>::value;
337 static const SK_OT_ULONG HalfwidthAndFullwidthFormsMask = SkTEnd ian_SwapBE32(1 << (68 - 64)); 337 static const SK_OT_ULONG HalfwidthAndFullwidthFormsMask = SkOTSe tULONGBit<68 - 64>::value;
338 static const SK_OT_ULONG SpecialsMask = SkTEndian_SwapBE32(1 << (69 - 64)); 338 static const SK_OT_ULONG SpecialsMask = SkOTSetULONGBit<69 - 64> ::value;
339 static const SK_OT_ULONG TibetanMask = SkTEndian_SwapBE32(1 << ( 70 - 64)); 339 static const SK_OT_ULONG TibetanMask = SkOTSetULONGBit<70 - 64>: :value;
340 static const SK_OT_ULONG SyriacMask = SkTEndian_SwapBE32(1 << (7 1 - 64)); 340 static const SK_OT_ULONG SyriacMask = SkOTSetULONGBit<71 - 64>:: value;
341 static const SK_OT_ULONG ThaanaMask = SkTEndian_SwapBE32(1 << (7 2 - 64)); 341 static const SK_OT_ULONG ThaanaMask = SkOTSetULONGBit<72 - 64>:: value;
342 static const SK_OT_ULONG SinhalaMask = SkTEndian_SwapBE32(1 << ( 73 - 64)); 342 static const SK_OT_ULONG SinhalaMask = SkOTSetULONGBit<73 - 64>: :value;
343 static const SK_OT_ULONG MyanmarMask = SkTEndian_SwapBE32(1 << ( 74 - 64)); 343 static const SK_OT_ULONG MyanmarMask = SkOTSetULONGBit<74 - 64>: :value;
344 static const SK_OT_ULONG EthiopicMask = SkTEndian_SwapBE32(1 << (75 - 64)); 344 static const SK_OT_ULONG EthiopicMask = SkOTSetULONGBit<75 - 64> ::value;
345 static const SK_OT_ULONG CherokeeMask = SkTEndian_SwapBE32(1 << (76 - 64)); 345 static const SK_OT_ULONG CherokeeMask = SkOTSetULONGBit<76 - 64> ::value;
346 static const SK_OT_ULONG UnifiedCanadianSyllabicsMask = SkTEndia n_SwapBE32(1 << (77 - 64)); 346 static const SK_OT_ULONG UnifiedCanadianSyllabicsMask = SkOTSetU LONGBit<77 - 64>::value;
347 static const SK_OT_ULONG OghamMask = SkTEndian_SwapBE32(1 << (78 - 64)); 347 static const SK_OT_ULONG OghamMask = SkOTSetULONGBit<78 - 64>::v alue;
348 static const SK_OT_ULONG RunicMask = SkTEndian_SwapBE32(1 << (79 - 64)); 348 static const SK_OT_ULONG RunicMask = SkOTSetULONGBit<79 - 64>::v alue;
349 static const SK_OT_ULONG KhmerMask = SkTEndian_SwapBE32(1 << (80 - 64)); 349 static const SK_OT_ULONG KhmerMask = SkOTSetULONGBit<80 - 64>::v alue;
350 static const SK_OT_ULONG MongolianMask = SkTEndian_SwapBE32(1 << (81 - 64)); 350 static const SK_OT_ULONG MongolianMask = SkOTSetULONGBit<81 - 64 >::value;
351 static const SK_OT_ULONG BrailleMask = SkTEndian_SwapBE32(1 << ( 82 - 64)); 351 static const SK_OT_ULONG BrailleMask = SkOTSetULONGBit<82 - 64>: :value;
352 static const SK_OT_ULONG YiMask = SkTEndian_SwapBE32(1 << (83 - 64)); 352 static const SK_OT_ULONG YiMask = SkOTSetULONGBit<83 - 64>::valu e;
353 }; 353 };
354 SK_OT_ULONG value[4]; 354 SK_OT_ULONG value[4];
355 } raw; 355 } raw;
356 } ulUnicodeRange; 356 } ulUnicodeRange;
357 SK_OT_CHAR achVendID[4]; 357 SK_OT_CHAR achVendID[4];
358 union Selection { 358 union Selection {
359 struct Field { 359 struct Field {
360 //8-15 360 //8-15
361 SK_OT_BYTE_BITFIELD( 361 SK_OT_BYTE_BITFIELD(
362 Reserved08, 362 Reserved08,
363 Reserved09, 363 Reserved09,
364 Reserved10, 364 Reserved10,
365 Reserved11, 365 Reserved11,
366 Reserved12, 366 Reserved12,
367 Reserved13, 367 Reserved13,
368 Reserved14, 368 Reserved14,
369 Reserved15) 369 Reserved15)
370 //0-7 370 //0-7
371 SK_OT_BYTE_BITFIELD( 371 SK_OT_BYTE_BITFIELD(
372 Italic, 372 Italic,
373 Underscore, 373 Underscore,
374 Negative, 374 Negative,
375 Outlined, 375 Outlined,
376 Strikeout, 376 Strikeout,
377 Bold, 377 Bold,
378 Regular, 378 Regular,
379 Reserved07) 379 Reserved07)
380 } field; 380 } field;
381 struct Raw { 381 struct Raw {
382 static const SK_OT_USHORT ItalicMask = SkTEndian_SwapBE16(1 << 0); 382 static const SK_OT_USHORT ItalicMask = SkOTSetUSHORTBit<0>::value;
383 static const SK_OT_USHORT UnderscoreMask = SkTEndian_SwapBE16(1 << 1 ); 383 static const SK_OT_USHORT UnderscoreMask = SkOTSetUSHORTBit<1>::valu e;
384 static const SK_OT_USHORT NegativeMask = SkTEndian_SwapBE16(1 << 2); 384 static const SK_OT_USHORT NegativeMask = SkOTSetUSHORTBit<2>::value;
385 static const SK_OT_USHORT OutlinedMask = SkTEndian_SwapBE16(1 << 3); 385 static const SK_OT_USHORT OutlinedMask = SkOTSetUSHORTBit<3>::value;
386 static const SK_OT_USHORT StrikeoutMask = SkTEndian_SwapBE16(1 << 4) ; 386 static const SK_OT_USHORT StrikeoutMask = SkOTSetUSHORTBit<4>::value ;
387 static const SK_OT_USHORT BoldMask = SkTEndian_SwapBE16(1 << 5); 387 static const SK_OT_USHORT BoldMask = SkOTSetUSHORTBit<5>::value;
388 static const SK_OT_USHORT RegularMask = SkTEndian_SwapBE16(1 << 6); 388 static const SK_OT_USHORT RegularMask = SkOTSetUSHORTBit<6>::value;
389 SK_OT_USHORT value; 389 SK_OT_USHORT value;
390 } raw; 390 } raw;
391 } fsSelection; 391 } fsSelection;
392 SK_OT_USHORT usFirstCharIndex; 392 SK_OT_USHORT usFirstCharIndex;
393 SK_OT_USHORT usLastCharIndex; 393 SK_OT_USHORT usLastCharIndex;
394 //version0 394 //version0
395 SK_OT_SHORT sTypoAscender; 395 SK_OT_SHORT sTypoAscender;
396 SK_OT_SHORT sTypoDescender; 396 SK_OT_SHORT sTypoDescender;
397 SK_OT_SHORT sTypoLineGap; 397 SK_OT_SHORT sTypoLineGap;
398 SK_OT_USHORT usWinAscent; 398 SK_OT_USHORT usWinAscent;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 Reserved33, 477 Reserved33,
478 Reserved34, 478 Reserved34,
479 Reserved35, 479 Reserved35,
480 Reserved36, 480 Reserved36,
481 Reserved37, 481 Reserved37,
482 Reserved38, 482 Reserved38,
483 Reserved39) 483 Reserved39)
484 } field; 484 } field;
485 struct Raw { 485 struct Raw {
486 struct l0 { 486 struct l0 {
487 static const SK_OT_ULONG Latin1_1252Mask = SkTEndian_SwapBE32(1 << 0); 487 static const SK_OT_ULONG Latin1_1252Mask = SkOTSetULONGBit<0>::v alue;
488 static const SK_OT_ULONG Latin2EasternEurope_1250Mask = SkTEndia n_SwapBE32(1 << 1); 488 static const SK_OT_ULONG Latin2EasternEurope_1250Mask = SkOTSetU LONGBit<1>::value;
489 static const SK_OT_ULONG Cyrillic_1251Mask = SkTEndian_SwapBE32( 1 << 2); 489 static const SK_OT_ULONG Cyrillic_1251Mask = SkOTSetULONGBit<2>: :value;
490 static const SK_OT_ULONG Greek_1253Mask = SkTEndian_SwapBE32(1 < < 3); 490 static const SK_OT_ULONG Greek_1253Mask = SkOTSetULONGBit<3>::va lue;
491 static const SK_OT_ULONG Turkish_1254Mask = SkTEndian_SwapBE32(1 << 4); 491 static const SK_OT_ULONG Turkish_1254Mask = SkOTSetULONGBit<4>:: value;
492 static const SK_OT_ULONG Hebrew_1255Mask = SkTEndian_SwapBE32(1 << 5); 492 static const SK_OT_ULONG Hebrew_1255Mask = SkOTSetULONGBit<5>::v alue;
493 static const SK_OT_ULONG Arabic_1256Mask = SkTEndian_SwapBE32(1 << 6); 493 static const SK_OT_ULONG Arabic_1256Mask = SkOTSetULONGBit<6>::v alue;
494 static const SK_OT_ULONG WindowsBaltic_1257Mask = SkTEndian_Swap BE32(1 << 7); 494 static const SK_OT_ULONG WindowsBaltic_1257Mask = SkOTSetULONGBi t<7>::value;
495 static const SK_OT_ULONG Vietnamese_1258Mask = SkTEndian_SwapBE3 2(1 << 8); 495 static const SK_OT_ULONG Vietnamese_1258Mask = SkOTSetULONGBit<8 >::value;
496 static const SK_OT_ULONG Thai_874Mask = SkTEndian_SwapBE32(1 << 16); 496 static const SK_OT_ULONG Thai_874Mask = SkOTSetULONGBit<16>::val ue;
497 static const SK_OT_ULONG JISJapan_932Mask = SkTEndian_SwapBE32(1 << 17); 497 static const SK_OT_ULONG JISJapan_932Mask = SkOTSetULONGBit<17>: :value;
498 static const SK_OT_ULONG ChineseSimplified_936Mask = SkTEndian_S wapBE32(1 << 18); 498 static const SK_OT_ULONG ChineseSimplified_936Mask = SkOTSetULON GBit<18>::value;
499 static const SK_OT_ULONG KoreanWansung_949Mask = SkTEndian_SwapB E32(1 << 19); 499 static const SK_OT_ULONG KoreanWansung_949Mask = SkOTSetULONGBit <19>::value;
500 static const SK_OT_ULONG ChineseTraditional_950Mask = SkTEndian_ SwapBE32(1 << 20); 500 static const SK_OT_ULONG ChineseTraditional_950Mask = SkOTSetULO NGBit<20>::value;
501 static const SK_OT_ULONG KoreanJohab_1361Mask = SkTEndian_SwapBE 32(1 << 21); 501 static const SK_OT_ULONG KoreanJohab_1361Mask = SkOTSetULONGBit< 21>::value;
502 static const SK_OT_ULONG MacintoshCharacterSetMask = SkTEndian_S wapBE32(1 << 29); 502 static const SK_OT_ULONG MacintoshCharacterSetMask = SkOTSetULON GBit<29>::value;
503 static const SK_OT_ULONG OEMCharacterSetMask = SkTEndian_SwapBE3 2(1 << 30); 503 static const SK_OT_ULONG OEMCharacterSetMask = SkOTSetULONGBit<3 0>::value;
504 static const SK_OT_ULONG SymbolCharacterSetMask = SkTEndian_Swap BE32(1 << 31); 504 static const SK_OT_ULONG SymbolCharacterSetMask = SkOTSetULONGBi t<31>::value;
505 }; 505 };
506 struct l1 { 506 struct l1 {
507 static const SK_OT_ULONG IBMGreek_869Mask = SkTEndian_SwapBE32(1 << (48 - 32)); 507 static const SK_OT_ULONG IBMGreek_869Mask = SkOTSetULONGBit<48 - 32>::value;
508 static const SK_OT_ULONG MSDOSRussian_866Mask = SkTEndian_SwapBE 32(1 << (49 - 32)); 508 static const SK_OT_ULONG MSDOSRussian_866Mask = SkOTSetULONGBit< 49 - 32>::value;
509 static const SK_OT_ULONG MSDOSNordic_865Mask = SkTEndian_SwapBE3 2(1 << (50 - 32)); 509 static const SK_OT_ULONG MSDOSNordic_865Mask = SkOTSetULONGBit<5 0 - 32>::value;
510 static const SK_OT_ULONG Arabic_864Mask = SkTEndian_SwapBE32(1 < < (51 - 32)); 510 static const SK_OT_ULONG Arabic_864Mask = SkOTSetULONGBit<51 - 3 2>::value;
511 static const SK_OT_ULONG MSDOSCanadianFrench_863Mask = SkTEndian _SwapBE32(1 << (52 - 32)); 511 static const SK_OT_ULONG MSDOSCanadianFrench_863Mask = SkOTSetUL ONGBit<52 - 32>::value;
512 static const SK_OT_ULONG Hebrew_862Mask = SkTEndian_SwapBE32(1 < < (53 - 32)); 512 static const SK_OT_ULONG Hebrew_862Mask = SkOTSetULONGBit<53 - 3 2>::value;
513 static const SK_OT_ULONG MSDOSIcelandic_861Mask = SkTEndian_Swap BE32(1 << (54 - 32)); 513 static const SK_OT_ULONG MSDOSIcelandic_861Mask = SkOTSetULONGBi t<54 - 32>::value;
514 static const SK_OT_ULONG MSDOSPortuguese_860Mask = SkTEndian_Swa pBE32(1 << (55 - 32)); 514 static const SK_OT_ULONG MSDOSPortuguese_860Mask = SkOTSetULONGB it<55 - 32>::value;
515 static const SK_OT_ULONG IBMTurkish_857Mask = SkTEndian_SwapBE32 (1 << (56 - 32)); 515 static const SK_OT_ULONG IBMTurkish_857Mask = SkOTSetULONGBit<56 - 32>::value;
516 static const SK_OT_ULONG IBMCyrillic_855Mask = SkTEndian_SwapBE3 2(1 << (57 - 32)); 516 static const SK_OT_ULONG IBMCyrillic_855Mask = SkOTSetULONGBit<5 7 - 32>::value;
517 static const SK_OT_ULONG Latin2_852Mask = SkTEndian_SwapBE32(1 < < (58 - 32)); 517 static const SK_OT_ULONG Latin2_852Mask = SkOTSetULONGBit<58 - 3 2>::value;
518 static const SK_OT_ULONG MSDOSBaltic_775Mask = SkTEndian_SwapBE3 2(1 << (59 - 32)); 518 static const SK_OT_ULONG MSDOSBaltic_775Mask = SkOTSetULONGBit<5 9 - 32>::value;
519 static const SK_OT_ULONG Greek_737Mask = SkTEndian_SwapBE32(1 << (60 - 32)); 519 static const SK_OT_ULONG Greek_737Mask = SkOTSetULONGBit<60 - 32 >::value;
520 static const SK_OT_ULONG Arabic_708Mask = SkTEndian_SwapBE32(1 < < (61 - 32)); 520 static const SK_OT_ULONG Arabic_708Mask = SkOTSetULONGBit<61 - 3 2>::value;
521 static const SK_OT_ULONG WELatin1_850Mask = SkTEndian_SwapBE32(1 << (62 - 32)); 521 static const SK_OT_ULONG WELatin1_850Mask = SkOTSetULONGBit<62 - 32>::value;
522 static const SK_OT_ULONG US_437Mask = SkTEndian_SwapBE32(1 << (6 3 - 32)); 522 static const SK_OT_ULONG US_437Mask = SkOTSetULONGBit<63 - 32>:: value;
523 }; 523 };
524 SK_OT_ULONG value[2]; 524 SK_OT_ULONG value[2];
525 } raw; 525 } raw;
526 } ulCodePageRange; 526 } ulCodePageRange;
527 //version2 527 //version2
528 SK_OT_SHORT sxHeight; 528 SK_OT_SHORT sxHeight;
529 SK_OT_SHORT sCapHeight; 529 SK_OT_SHORT sCapHeight;
530 SK_OT_USHORT usDefaultChar; 530 SK_OT_USHORT usDefaultChar;
531 SK_OT_USHORT usBreakChar; 531 SK_OT_USHORT usBreakChar;
532 SK_OT_USHORT usMaxContext; 532 SK_OT_USHORT usMaxContext;
533 }; 533 };
534 534
535 #pragma pack(pop) 535 #pragma pack(pop)
536 536
537 537
538 SK_COMPILE_ASSERT(sizeof(SkOTTableOS2_V2) == 96, sizeof_SkOTTableOS2_V2_not_96); 538 SK_COMPILE_ASSERT(sizeof(SkOTTableOS2_V2) == 96, sizeof_SkOTTableOS2_V2_not_96);
539 539
540 #endif 540 #endif
OLDNEW
« no previous file with comments | « src/sfnt/SkOTTable_OS_2_V1.h ('k') | src/sfnt/SkOTTable_OS_2_V3.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698