From aba4a4957ad48fd34917d44d7005ffe73b3065e9 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 30 Jun 2022 14:13:44 -0600
Subject: [PATCH] [ot-font] Disable VORG variation code in HB_NO_VAR

---
 src/hb-ot-font.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index cc26f0624..c57398a7f 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -295,6 +295,7 @@ hb_ot_get_glyph_v_origin (hb_font_t *font,
   {
     float delta = 0;
 
+#ifndef HB_NO_VAR
     const OT::vmtx_accelerator_t &vmtx = *ot_face->vmtx;
     const OT::VVAR &VVAR = *vmtx.var_table;
     if (font->num_coords &&
@@ -302,11 +303,14 @@ hb_ot_get_glyph_v_origin (hb_font_t *font,
 			    font->coords, font->num_coords,
 			    &delta))
       goto out;
+#endif
 
-    *y = font->em_scale_y (VORG.get_y_origin (glyph) + delta);
+    *y = font->em_scalef_y (VORG.get_y_origin (glyph) + delta);
     return true;
   }
+#ifndef HB_NO_VAR
 out:
+#endif
 
   hb_glyph_extents_t extents = {0};
   if (ot_face->glyf->get_extents (font, glyph, &extents))