From 44b7ba51a3e035959fde32909d628200e2be9dc6 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 26 Feb 2025 13:47:45 -0700
Subject: [PATCH] [GVAR] Hide behind HB_NO_BEYOND_64K

---
 src/OT/glyf/Glyph.hh         | 2 ++
 src/OT/glyf/glyf.hh          | 6 ++++++
 src/hb-ot-face-table-list.hh | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/src/OT/glyf/Glyph.hh b/src/OT/glyf/Glyph.hh
index 5df44997b..ccd460ba0 100644
--- a/src/OT/glyf/Glyph.hh
+++ b/src/OT/glyf/Glyph.hh
@@ -387,6 +387,7 @@ struct Glyph
 #ifndef HB_NO_VAR
     if (coords)
     {
+#ifndef HB_NO_BEYOND_64K
       if (glyf_accelerator.GVAR->has_data ())
 	glyf_accelerator.GVAR->apply_deltas_to_points (gid,
 						       coords,
@@ -394,6 +395,7 @@ struct Glyph
 						       scratch,
 						       phantom_only && type == SIMPLE);
       else
+#endif
 	glyf_accelerator.gvar->apply_deltas_to_points (gid,
 						       coords,
 						       points.as_array ().sub_array (old_length),
diff --git a/src/OT/glyf/glyf.hh b/src/OT/glyf/glyf.hh
index d8774bea7..fe4ae7b8c 100644
--- a/src/OT/glyf/glyf.hh
+++ b/src/OT/glyf/glyf.hh
@@ -172,7 +172,9 @@ struct glyf_accelerator_t
     glyf_table = nullptr;
 #ifndef HB_NO_VAR
     gvar = nullptr;
+#ifndef HB_NO_BEYOND_64K
     GVAR = nullptr;
+#endif
 #endif
     hmtx = nullptr;
 #ifndef HB_NO_VERTICAL
@@ -188,7 +190,9 @@ struct glyf_accelerator_t
     glyf_table = hb_sanitize_context_t ().reference_table<glyf> (face);
 #ifndef HB_NO_VAR
     gvar = face->table.gvar;
+#ifndef HB_NO_BEYOND_64K
     GVAR = face->table.GVAR;
+#endif
 #endif
     hmtx = face->table.hmtx;
 #ifndef HB_NO_VERTICAL
@@ -514,7 +518,9 @@ struct glyf_accelerator_t
 
 #ifndef HB_NO_VAR
   const gvar_accelerator_t *gvar;
+#ifndef HB_NO_BEYOND_64K
   const GVAR_accelerator_t *GVAR;
+#endif
 #endif
   const hmtx_accelerator_t *hmtx;
 #ifndef HB_NO_VERTICAL
diff --git a/src/hb-ot-face-table-list.hh b/src/hb-ot-face-table-list.hh
index 526bea967..97825f4d1 100644
--- a/src/hb-ot-face-table-list.hh
+++ b/src/hb-ot-face-table-list.hh
@@ -95,7 +95,9 @@ HB_OT_CORE_TABLE (OT, fvar)
 HB_OT_CORE_TABLE (OT, avar)
 HB_OT_CORE_TABLE (OT, cvar)
 HB_OT_ACCELERATOR (OT, gvar)
+#ifndef HB_NO_BEYOND_64K
 HB_OT_ACCELERATOR (OT, GVAR)
+#endif
 HB_OT_CORE_TABLE (OT, MVAR)
 #ifndef HB_NO_VAR_COMPOSITES
 HB_OT_ACCELERATOR (OT, VARC)