Imported Upstream version 1.2.7

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

diff --git a/src/hb-ot-maxp-table.hh b/src/hb-ot-maxp-table.hh
index 0d9a0fa..943e390 100644 (file)
--- a/src/hb-ot-maxp-table.hh
+++ b/src/hb-ot-maxp-table.hh
@@ -51,13 +51,14 @@ struct maxp
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return TRACE_RETURN (c->check_struct (this) &&
-                        likely (version.major == 1 || (version.major == 0 && version.minor == 0x5000u)));
+    return_trace (c->check_struct (this) &&
+                 likely (version.major == 1 ||
+                         (version.major == 0 && version.minor == 0x5000u)));
   }
 
   /* We only implement version 0.5 as none of the extra fields in version 1.0 are useful. */
   protected:
-  FixedVersion version;                /* Version of the maxp table (0.5 or 1.0),
+  FixedVersion<>version;               /* Version of the maxp table (0.5 or 1.0),
                                         * 0x00005000u or 0x00010000u. */
   USHORT       numGlyphs;              /* The number of glyphs in the font. */
   public: