Roll harfbuzz-ng to 1.0.5

third_party/harfbuzz-ng/src/hb-ot-head-table.hh

 /*
  * Copyright © 2010  Red Hat, Inc.
  * Copyright © 2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
  * Permission is hereby granted, without written agreement and without
  * license or royalty fees, to use, copy, modify, and distribute this
  * software and its documentation for any purpose, provided that the
  * above copyright notice and the following two paragraphs appear in
@@ skipping 37 matching lines @@
   inline unsigned int get_upem (void) const
   {
     unsigned int upem = unitsPerEm;
     /* If no valid head table found, assume 1000, which matches typical Type1 usage. */
     return 16 <= upem && upem <= 16384 ? upem : 1000;
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return TRACE_RETURN (c->check_struct (this) && likely (version.major == 1));
+    return_trace (c->check_struct (this) && likely (version.major == 1));
   }
 
   protected:
   FixedVersion  version;                /* Version of the head table--currently
                                          * 0x00010000u for version 1.0. */
   FixedVersion  fontRevision;           /* Set by font manufacturer. */
   ULONG         checkSumAdjustment;     /* To compute: set it to 0, sum the
                                          * entire font as ULONG, then store
                                          * 0xB1B0AFBAu - sum. */
   ULONG         magicNumber;            /* Set to 0x5F0F3CF5u. */
@@ skipping 62 matching lines @@
                                          * Bit 5: Condensed (if set to 1)
                                          * Bit 6: Extended (if set to 1)
                                          * Bits 7-15: Reserved (set to 0). */
   USHORT        lowestRecPPEM;          /* Smallest readable size in pixels. */
   SHORT         fontDirectionHint;      /* Deprecated (Set to 2).
                                          * 0: Fully mixed directional glyphs;
                                          * 1: Only strongly left to right;
                                          * 2: Like 1 but also contains neutrals;
                                          * -1: Only strongly right to left;
                                          * -2: Like -1 but also contains neutrals. */
+  public:
   SHORT         indexToLocFormat;       /* 0 for short offsets, 1 for long. */
   SHORT         glyphDataFormat;        /* 0 for current format. */
-  public:
+
   DEFINE_SIZE_STATIC (54);
 };
 
 
 } /* namespace OT */
 
 
 #endif /* HB_OT_HEAD_TABLE_HH */