From b2d60cbd6ebbcaa51291144701312578efd90ebd Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Sun, 3 Jul 2022 12:56:48 -0600
Subject: [PATCH] [glyf] Rename advance functions for clarity

---
 src/OT/glyf/glyf.hh     | 2 +-
 src/hb-ot-font.cc       | 4 ++--
 src/hb-ot-hmtx-table.hh | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/OT/glyf/glyf.hh b/src/OT/glyf/glyf.hh
index 962e35fca..0f335b7a0 100644
--- a/src/OT/glyf/glyf.hh
+++ b/src/OT/glyf/glyf.hh
@@ -258,7 +258,7 @@ struct glyf_accelerator_t
 
   public:
   unsigned
-  get_advance_var (hb_font_t *font, hb_codepoint_t gid, bool is_vertical) const
+  get_advance_with_var_unscaled (hb_font_t *font, hb_codepoint_t gid, bool is_vertical) const
   {
     if (unlikely (gid >= num_glyphs)) return 0;
 
diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index 34b834051..406c379ee 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -521,9 +521,9 @@ _glyf_get_side_bearing_var (hb_font_t *font, hb_codepoint_t glyph, bool is_verti
 }
 
 unsigned
-_glyf_get_advance_var (hb_font_t *font, hb_codepoint_t glyph, bool is_vertical)
+_glyf_get_advance_with_var_unscaled (hb_font_t *font, hb_codepoint_t glyph, bool is_vertical)
 {
-  return font->face->table.glyf->get_advance_var (font, glyph, is_vertical);
+  return font->face->table.glyf->get_advance_with_var_unscaled (font, glyph, is_vertical);
 }
 #endif
 
diff --git a/src/hb-ot-hmtx-table.hh b/src/hb-ot-hmtx-table.hh
index e7b69b960..9bb99471e 100644
--- a/src/hb-ot-hmtx-table.hh
+++ b/src/hb-ot-hmtx-table.hh
@@ -47,7 +47,7 @@ HB_INTERNAL int
 _glyf_get_side_bearing_var (hb_font_t *font, hb_codepoint_t glyph, bool is_vertical);
 
 HB_INTERNAL unsigned
-_glyf_get_advance_var (hb_font_t *font, hb_codepoint_t glyph, bool is_vertical);
+_glyf_get_advance_with_var_unscaled (hb_font_t *font, hb_codepoint_t glyph, bool is_vertical);
 
 
 namespace OT {
@@ -299,7 +299,7 @@ struct hmtxvmtx
 							     font->coords, font->num_coords,
 							     store_cache)); // TODO Optimize?!
 
-      return _glyf_get_advance_var (font, glyph, T::tableTag == HB_OT_TAG_vmtx);
+      return _glyf_get_advance_with_var_unscaled (font, glyph, T::tableTag == HB_OT_TAG_vmtx);
 #else
       return advance;
 #endif