diff --git a/src/hb-config.hh b/src/hb-config.hh index 28e70839e..677360bee 100644 --- a/src/hb-config.hh +++ b/src/hb-config.hh @@ -141,6 +141,10 @@ #define HB_NO_PAINT #endif +#if defined(HB_TINY) && defined(HB_NO_DRAW) +#define HB_NO_CFF +#endif + #ifdef HB_NO_CFF #define HB_NO_OT_FONT_CFF #define HB_NO_SUBSET_CFF diff --git a/src/hb-subset-plan-var.cc b/src/hb-subset-plan-var.cc index fe29127d9..6075ed708 100644 --- a/src/hb-subset-plan-var.cc +++ b/src/hb-subset-plan-var.cc @@ -285,6 +285,7 @@ normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan) return true; } +#ifndef HB_NO_OT_FONT_CFF void update_instance_metrics_map_from_cff2 (hb_subset_plan_t *plan) { @@ -370,6 +371,7 @@ update_instance_metrics_map_from_cff2 (hb_subset_plan_t *plan) if (vvar_store_cache) _vmtx.var_table->get_var_store ().destroy_cache (vvar_store_cache); } +#endif bool get_instance_glyphs_contour_points (hb_subset_plan_t *plan) diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc index 767c1bf2d..b1325dd2e 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc @@ -743,8 +743,10 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face, if (unlikely (in_error ())) return; -#ifndef HB_NO_VAR +#if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_CFF) update_instance_metrics_map_from_cff2 (this); +#endif +#ifndef HB_NO_VAR if (!check_success (get_instance_glyphs_contour_points (this))) return; #endif