commit 9d3cdb6886a6a6ee41aea32b04bb950b565cdd9f
author bungeman <bungeman@google.com> Tue Jul 15 20:01:56 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 15 20:01:56 2014 -0700
tree 1a84eab55ef864b00ed2f05421daa6bcd32353fe
parent 285d375508611c790b4c816a759cd4f634c218a3

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

src/sfnt/SkOTTable_maxp_CFF.h

diff --git a/src/sfnt/SkOTTable_maxp_CFF.h b/src/sfnt/SkOTTable_maxp_CFF.h
index 873fb66..f97bff9 100644
--- a/src/sfnt/SkOTTable_maxp_CFF.h
+++ b/src/sfnt/SkOTTable_maxp_CFF.h
@@ -24,7 +24,7 @@
 
 
 #include <stddef.h>
-SK_COMPILE_ASSERT(offsetof(SkOTTableMaximumProfile_CFF, numGlyphs) == 4, SkOTTableHead_glyphDataFormat_not_at_2);
-SK_COMPILE_ASSERT(sizeof(SkOTTableMaximumProfile_CFF) == 6, sizeof_SkOTTableHead_not_4);
+SK_COMPILE_ASSERT(offsetof(SkOTTableMaximumProfile_CFF, numGlyphs) == 4, SkOTTableMaximumProfile_CFF_numGlyphs_not_at_4);
+SK_COMPILE_ASSERT(sizeof(SkOTTableMaximumProfile_CFF) == 6, sizeof_SkOTTableMaximumProfile_CFF_not_6);
 
 #endif

src/sfnt/SkOTTable_maxp_TT.h

diff --git a/src/sfnt/SkOTTable_maxp_TT.h b/src/sfnt/SkOTTable_maxp_TT.h
index ad472a1..9aa557f 100644
--- a/src/sfnt/SkOTTable_maxp_TT.h
+++ b/src/sfnt/SkOTTable_maxp_TT.h
@@ -24,7 +24,7 @@
     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 @@
     SK_OT_USHORT maxInstructionDefs;
     SK_OT_USHORT maxStackElements;
     SK_OT_USHORT maxSizeOfInstructions;
+    SK_OT_USHORT maxComponentElements;
     SK_OT_USHORT maxComponentDepth;
 };
 
@@ -43,7 +44,7 @@
 
 
 #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