Imported Upstream version 2.6.7

[platform/upstream/harfbuzz.git] / src / hb-aat-layout-trak-table.hh

diff --git a/src/hb-aat-layout-trak-table.hh b/src/hb-aat-layout-trak-table.hh
index 99dddd8..baa1c72 100644 (file)
--- a/src/hb-aat-layout-trak-table.hh
+++ b/src/hb-aat-layout-trak-table.hh
@@ -62,7 +62,7 @@ struct TrackTableEntry
   }
 
   protected:
-  HBFixed              track;          /* Track value for this record. */
+  HBFixed      track;          /* Track value for this record. */
   NameID       trackNameID;    /* The 'name' table index for this track.
                                 * (a short word or phrase like "loose"
                                 * or "very tight") */
@@ -141,7 +141,7 @@ struct TrackData
   protected:
   HBUINT16     nTracks;        /* Number of separate tracks included in this table. */
   HBUINT16     nSizes;         /* Number of point sizes included in this table. */
-  LOffsetTo<UnsizedArrayOf<HBFixed>, false>
+  LNNOffsetTo<UnsizedArrayOf<HBFixed>>
                sizeTable;      /* Offset from start of the tracking table to
                                 * Array[nSizes] of size values.. */
   UnsizedArrayOf<TrackTableEntry>
@@ -210,8 +210,8 @@ struct trak
 
   protected:
   FixedVersion<>version;       /* Version of the tracking table
-                                        * (0x00010000u for version 1.0). */
-  HBUINT16     format;         /* Format of the tracking table (set to 0). */
+                                * (0x00010000u for version 1.0). */
+  HBUINT16     format;         /* Format of the tracking table (set to 0). */
   OffsetTo<TrackData>
                horizData;      /* Offset from start of tracking table to TrackData
                                 * for horizontal text (or 0 if none). */