Imported Upstream version 2.6.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 e20b372..4137742 100644 (file)
--- a/src/hb-ot-hmtx-table.hh
+++ b/src/hb-ot-hmtx-table.hh
@@ -169,7 +169,7 @@ struct hmtxvmtx
 
       num_advances = T::is_horizontal ? face->table.hhea->numberOfLongMetrics : face->table.vhea->numberOfLongMetrics;
 
-      table = hb_sanitize_context_t().reference_table<hmtxvmtx> (face, T::tableTag);
+      table = hb_sanitize_context_t ().reference_table<hmtxvmtx> (face, T::tableTag);
 
       /* Cap num_metrics() and num_advances() based on table length. */
       unsigned int len = table.get_length ();
@@ -186,7 +186,7 @@ struct hmtxvmtx
        table = hb_blob_get_empty ();
       }
 
-      var_table = hb_sanitize_context_t().reference_table<HVARVVAR> (face, T::variationsTag);
+      var_table = hb_sanitize_context_t ().reference_table<HVARVVAR> (face, T::variationsTag);
     }
 
     void fini ()
@@ -216,7 +216,7 @@ struct hmtxvmtx
        return side_bearing;
 
       if (var_table.get_length ())
-        return side_bearing + var_table->get_side_bearing_var (glyph, font->coords, font->num_coords); // TODO Optimize?!
+       return side_bearing + var_table->get_side_bearing_var (glyph, font->coords, font->num_coords); // TODO Optimize?!
 
       return _glyf_get_side_bearing_var (font, glyph, T::tableTag == HB_OT_TAG_vmtx);
 #else
@@ -250,7 +250,7 @@ struct hmtxvmtx
        return advance;
 
       if (var_table.get_length ())
-       return advance + roundf (var_table->get_advance_var (font, glyph)); // TODO Optimize?!
+       return advance + roundf (var_table->get_advance_var (glyph, font)); // TODO Optimize?!
 
       return _glyf_get_advance_var (font, glyph, T::tableTag == HB_OT_TAG_vmtx);
 #else
@@ -295,27 +295,29 @@ struct hmtxvmtx
   };
 
   protected:
-  UnsizedArrayOf<LongMetric>longMetricZ;/* Paired advance width and leading
-                                        * bearing values for each glyph. The
-                                        * value numOfHMetrics comes from
-                                        * the 'hhea' table. If the font is
-                                        * monospaced, only one entry need
-                                        * be in the array, but that entry is
-                                        * required. The last entry applies to
-                                        * all subsequent glyphs. */
-/*UnsizedArrayOf<FWORD>        leadingBearingX;*//* 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
-                                        * derived from numGlyphs (from 'maxp'
-                                        * table) minus numberOfLongMetrics.
-                                        * This generally is used with a run
-                                        * of monospaced glyphs (e.g., Kanji
-                                        * fonts or Courier fonts). Only one
-                                        * run is allowed and it must be at
-                                        * the end. This allows a monospaced
-                                        * font to vary the side bearing
-                                        * values for each glyph. */
+  UnsizedArrayOf<LongMetric>
+               longMetricZ;    /* Paired advance width and leading
+                                * bearing values for each glyph. The
+                                * value numOfHMetrics comes from
+                                * the 'hhea' table. If the font is
+                                * monospaced, only one entry need
+                                * be in the array, but that entry is
+                                * required. The last entry applies to
+                                * all subsequent glyphs. */
+/*UnsizedArrayOf<FWORD>        leadingBearingX;*/
+                               /* 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
+                                * derived from numGlyphs (from 'maxp'
+                                * table) minus numberOfLongMetrics.
+                                * This generally is used with a run
+                                * of monospaced glyphs (e.g., Kanji
+                                * fonts or Courier fonts). Only one
+                                * run is allowed and it must be at
+                                * the end. This allows a monospaced
+                                * font to vary the side bearing
+                                * values for each glyph. */
   public:
   DEFINE_SIZE_ARRAY (0, longMetricZ);
 };