Imported Upstream version 1.4.6

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

diff --git a/src/hb-ot-hmtx-table.hh b/src/hb-ot-hmtx-table.hh
index a0e3855..30aa625 100644 (file)
--- a/src/hb-ot-hmtx-table.hh
+++ b/src/hb-ot-hmtx-table.hh
@@ -44,16 +44,14 @@ namespace OT {
 
 struct LongMetric
 {
-  USHORT       advance; /* Advance width/height. */
-  SHORT                lsb; /* Leading (left/top) side bearing. */
+  UFWORD       advance; /* Advance width/height. */
+  FWORD                lsb; /* Leading (left/top) side bearing. */
   public:
   DEFINE_SIZE_STATIC (4);
 };
 
-struct _mtx
+struct hmtxvmtx
 {
-  static const hb_tag_t tableTag = HB_TAG('_','m','t','x');
-
   static const hb_tag_t hmtxTag        = HB_OT_TAG_hmtx;
   static const hb_tag_t vmtxTag        = HB_OT_TAG_vmtx;
 
@@ -62,7 +60,7 @@ struct _mtx
     TRACE_SANITIZE (this);
     /* We don't check for anything specific here.  The users of the
      * struct do all the hard work... */
-    return TRACE_RETURN (true);
+    return_trace (true);
   }
 
   public:
@@ -74,7 +72,7 @@ struct _mtx
                                         * be in the array, but that entry is
                                         * required. The last entry applies to
                                         * all subsequent glyphs. */
-  SHORT                leadingBearingX[VAR];   /* Here the advance is assumed
+  FWORD                leadingBearingX[VAR];   /* Here the advance is assumed
                                         * to be the same as the advance
                                         * for the last entry above. The
                                         * number of entries in this array is
@@ -91,10 +89,10 @@ struct _mtx
   DEFINE_SIZE_ARRAY2 (0, longMetric, leadingBearingX);
 };
 
-struct hmtx : _mtx {
+struct hmtx : hmtxvmtx {
   static const hb_tag_t tableTag       = HB_OT_TAG_hmtx;
 };
-struct vmtx : _mtx {
+struct vmtx : hmtxvmtx {
   static const hb_tag_t tableTag       = HB_OT_TAG_vmtx;
 };