Imported Upstream version 1.7.6

[platform/upstream/harfbuzz.git] / src / hb-ot-var-hvar-table.hh

diff --git a/src/hb-ot-var-hvar-table.hh b/src/hb-ot-var-hvar-table.hh
index f9d801e..e20131b 100644 (file)
--- a/src/hb-ot-var-hvar-table.hh
+++ b/src/hb-ot-var-hvar-table.hh
@@ -55,7 +55,7 @@ struct DeltaSetIndexMap
     unsigned int u = 0;
     { /* Fetch it. */
       unsigned int w = get_width ();
-      const BYTE *p = mapData + w * v;
+      const HBUINT8 *p = mapData + w * v;
       for (; w; w--)
        u = (u << 8) + *p++;
     }
@@ -78,10 +78,10 @@ struct DeltaSetIndexMap
   { return (format & 0xF) + 1; }
 
   protected:
-  USHORT       format;         /* A packed field that describes the compressed
+  HBUINT16     format;         /* A packed field that describes the compressed
                                 * representation of delta-set indices. */
-  USHORT       mapCount;       /* The number of mapping entries. */
-  BYTE         mapData[VAR];   /* The delta-set index mapping data. */
+  HBUINT16     mapCount;       /* The number of mapping entries. */
+  HBUINT8              mapData[VAR];   /* The delta-set index mapping data. */
 
   public:
   DEFINE_SIZE_ARRAY (4, mapData);