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

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

Issue 1306443004: Use static_assert instead of SK_COMPILE_ASSERT. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « src/sfnt/SkOTTable_hhea.h ('k') | src/sfnt/SkOTTable_maxp_TT.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_maxp_CFF_DEFINED 8 #ifndef SkOTTable_maxp_CFF_DEFINED
9 #define SkOTTable_maxp_CFF_DEFINED 9 #define SkOTTable_maxp_CFF_DEFINED
10 10
11 #include "SkEndian.h" 11 #include "SkEndian.h"
12 #include "SkOTTableTypes.h" 12 #include "SkOTTableTypes.h"
13 13
14 #pragma pack(push, 1) 14 #pragma pack(push, 1)
15 15
16 struct SkOTTableMaximumProfile_CFF { 16 struct SkOTTableMaximumProfile_CFF {
17 SK_OT_Fixed version; 17 SK_OT_Fixed version;
18 static const SK_OT_Fixed VERSION = SkTEndian_SwapBE32(0x00005000); 18 static const SK_OT_Fixed VERSION = SkTEndian_SwapBE32(0x00005000);
19 19
20 SK_OT_USHORT numGlyphs; 20 SK_OT_USHORT numGlyphs;
21 }; 21 };
22 22
23 #pragma pack(pop) 23 #pragma pack(pop)
24 24
25 25
26 #include <stddef.h> 26 #include <stddef.h>
27 SK_COMPILE_ASSERT(offsetof(SkOTTableMaximumProfile_CFF, numGlyphs) == 4, SkOTTab leMaximumProfile_CFF_numGlyphs_not_at_4); 27 static_assert(offsetof(SkOTTableMaximumProfile_CFF, numGlyphs) == 4, "SkOTTableM aximumProfile_CFF_numGlyphs_not_at_4");
28 SK_COMPILE_ASSERT(sizeof(SkOTTableMaximumProfile_CFF) == 6, sizeof_SkOTTableMaxi mumProfile_CFF_not_6); 28 static_assert(sizeof(SkOTTableMaximumProfile_CFF) == 6, "sizeof_SkOTTableMaximum Profile_CFF_not_6");
29 29
30 #endif 30 #endif
OLDNEW
« no previous file with comments | « src/sfnt/SkOTTable_hhea.h ('k') | src/sfnt/SkOTTable_maxp_TT.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698