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

Unified Diff: src/sfnt/SkOTTable_maxp_TT.h

Issue 390203003: Fix some issues with sfnt maxp headers. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/sfnt/SkOTTable_maxp_CFF.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/sfnt/SkOTTable_maxp_TT.h
diff --git a/src/sfnt/SkOTTable_maxp_TT.h b/src/sfnt/SkOTTable_maxp_TT.h
index ad472a1f16a6e58268027370f01455accf556919..9aa557ff30af1c5b8e02e00c3fa75d8973f63617 100644
--- a/src/sfnt/SkOTTable_maxp_TT.h
+++ b/src/sfnt/SkOTTable_maxp_TT.h
@@ -24,7 +24,7 @@ struct SkOTTableMaximumProfile_TT {
SK_OT_USHORT maxCompositePoints;
SK_OT_USHORT maxCompositeContours;
struct MaxZones {
- SK_TYPED_ENUM(Value, SK_OT_SHORT,
+ SK_TYPED_ENUM(Value, SK_OT_USHORT,
((DoesNotUseTwilightZone, SkTEndian_SwapBE16(1)))
((UsesTwilightZone, SkTEndian_SwapBE16(2)))
SK_SEQ_END,
@@ -36,6 +36,7 @@ struct SkOTTableMaximumProfile_TT {
SK_OT_USHORT maxInstructionDefs;
SK_OT_USHORT maxStackElements;
SK_OT_USHORT maxSizeOfInstructions;
+ SK_OT_USHORT maxComponentElements;
SK_OT_USHORT maxComponentDepth;
};
@@ -43,7 +44,7 @@ struct SkOTTableMaximumProfile_TT {
#include <stddef.h>
-SK_COMPILE_ASSERT(offsetof(SkOTTableMaximumProfile_TT, maxComponentDepth) == 28, SkOTTableMaximumProfile_TT_maxComponentDepth_not_at_26);
-SK_COMPILE_ASSERT(sizeof(SkOTTableMaximumProfile_TT) == 30, sizeof_SkOTTableMaximumProfile_TT_not_28);
+SK_COMPILE_ASSERT(offsetof(SkOTTableMaximumProfile_TT, maxComponentDepth) == 30, SkOTTableMaximumProfile_TT_maxComponentDepth_not_at_30);
+SK_COMPILE_ASSERT(sizeof(SkOTTableMaximumProfile_TT) == 32, sizeof_SkOTTableMaximumProfile_TT_not_32);
#endif
« no previous file with comments | « src/sfnt/SkOTTable_maxp_CFF.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698