diff options
| author |  bungeman <bungeman@google.com> | 2014-07-15 20:01:56 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-15 20:01:56 -0700 |
| commit | 9d3cdb6886a6a6ee41aea32b04bb950b565cdd9f (patch) | |
| tree | 1a84eab55ef864b00ed2f05421daa6bcd32353fe /src/sfnt/SkOTTable_maxp_TT.h | |
| parent | 285d375508611c790b4c816a759cd4f634c218a3 (diff) | |
Fix some issues with sfnt maxp headers.
The TT version was missing the second to last member,
and the names of the asserts in the CFF version were wrong.
R=mtklein@google.com
Author: bungeman@google.com
Review URL: https://codereview.chromium.org/390203003
Diffstat (limited to 'src/sfnt/SkOTTable_maxp_TT.h')
| -rw-r--r-- | src/sfnt/SkOTTable_maxp_TT.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/sfnt/SkOTTable_maxp_TT.h b/src/sfnt/SkOTTable_maxp_TT.h index ad472a1f16..9aa557ff30 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 |