From b07fa2bb1a07712bf5350955573512e60cecd53f Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Sat, 2 Jul 2022 13:43:23 -0600
Subject: [PATCH] [ot-font] Respect VORG even if it has no variations

---
 src/hb-ot-font.cc | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index c57398a7f..58c7c64d1 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -298,19 +298,15 @@ hb_ot_get_glyph_v_origin (hb_font_t *font,
 #ifndef HB_NO_VAR
     const OT::vmtx_accelerator_t &vmtx = *ot_face->vmtx;
     const OT::VVAR &VVAR = *vmtx.var_table;
-    if (font->num_coords &&
-	!VVAR.get_vorg_var (glyph,
-			    font->coords, font->num_coords,
-			    &delta))
-      goto out;
+    if (font->num_coords)
+      VVAR.get_vorg_var (glyph,
+			 font->coords, font->num_coords,
+			 &delta);
 #endif
 
     *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))