From bf27f4a3b2399bcf2a275f8616d2c91e83db2ea2 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sat, 16 Mar 2024 14:50:27 -0600 Subject: [PATCH] [varc] Fix config --- src/OT/Var/VARC/VARC.cc | 2 +- src/hb-config.hh | 4 ++++ src/hb-ot-font.cc | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/OT/Var/VARC/VARC.cc b/src/OT/Var/VARC/VARC.cc index 6e84cbb5b..933d2db25 100644 --- a/src/OT/Var/VARC/VARC.cc +++ b/src/OT/Var/VARC/VARC.cc @@ -1,6 +1,6 @@ #include "VARC.hh" -#ifndef HB_NO_VAR +#ifndef HB_NO_VAR_COMPOSITES namespace OT { diff --git a/src/hb-config.hh b/src/hb-config.hh index 816c55c7d..79fee1751 100644 --- a/src/hb-config.hh +++ b/src/hb-config.hh @@ -118,6 +118,10 @@ #define HB_NO_VAR_COMPOSITES #endif +#ifdef HB_NO_VAR +#define HB_NO_VAR_COMPOSITES +#endif + #ifdef HB_DISABLE_DEPRECATED #define HB_IF_NOT_DEPRECATED(x) #else diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc index 5726949da..2495306d2 100644 --- a/src/hb-ot-font.cc +++ b/src/hb-ot-font.cc @@ -524,7 +524,7 @@ hb_ot_draw_glyph (hb_font_t *font, { // Need draw_session to be destructed before emboldening. hb_draw_session_t draw_session (embolden ? hb_outline_recording_pen_get_funcs () : draw_funcs, embolden ? &outline : draw_data, font->slant_xy); -#ifndef HB_NO_VAR +#ifndef HB_NO_VAR_COMPOSITES if (!font->face->table.VARC->get_path (font, glyph, draw_session)) #endif // Keep the following in synch with VARC::get_path_at() @@ -568,7 +568,7 @@ hb_ot_paint_glyph (hb_font_t *font, if (font->face->table.sbix->paint_glyph (font, glyph, paint_funcs, paint_data)) return; #endif #endif -#ifndef HB_NO_VAR +#ifndef HB_NO_VAR_COMPOSITES if (font->face->table.VARC->paint_glyph (font, glyph, paint_funcs, paint_data, foreground)) return; #endif if (font->face->table.glyf->paint_glyph (font, glyph, paint_funcs, paint_data, foreground)) return;