Revert "Imported Upstream version 1.2.7"

[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 a9606b3..a0e3855 100644 (file)
--- a/src/hb-ot-hmtx-table.hh
+++ b/src/hb-ot-hmtx-table.hh
@@ -44,8 +44,8 @@ namespace OT {
 
 struct LongMetric
 {
-  UFWORD       advance; /* Advance width/height. */
-  FWORD                lsb; /* Leading (left/top) side bearing. */
+  USHORT       advance; /* Advance width/height. */
+  SHORT                lsb; /* Leading (left/top) side bearing. */
   public:
   DEFINE_SIZE_STATIC (4);
 };
@@ -62,7 +62,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 (true);
+    return TRACE_RETURN (true);
   }
 
   public:
@@ -74,7 +74,7 @@ struct _mtx
                                         * be in the array, but that entry is
                                         * required. The last entry applies to
                                         * all subsequent glyphs. */
-  FWORD                leadingBearingX[VAR];   /* Here the advance is assumed
+  SHORT                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