From 7f6fca4ef78cf3c9384bf835def14219b2ce8791 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 12 May 2019 10:29:47 -0700 Subject: [PATCH] Force-disable CFF code under disabling conditions Subsetter size goes down from 190kb to 119kb. Main library about 7kb. Part of https://github.com/harfbuzz/harfbuzz/issues/1652 --- src/hb-ot-cff1-table.cc | 4 ++++ src/hb-ot-cff2-table.cc | 4 ++++ src/hb-subset-cff1.cc | 4 ++++ src/hb-subset-cff2.cc | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/src/hb-ot-cff1-table.cc b/src/hb-ot-cff1-table.cc index 2844f3ca4..e6dd6a7b8 100644 --- a/src/hb-ot-cff1-table.cc +++ b/src/hb-ot-cff1-table.cc @@ -27,6 +27,8 @@ #include "hb-ot-cff1-table.hh" #include "hb-cff1-interp-cs.hh" +#ifndef HB_NO_CFF + using namespace CFF; /* SID to code */ @@ -388,3 +390,5 @@ bool OT::cff1::accelerator_t::get_seac_components (hb_codepoint_t glyph, hb_code } return false; } + +#endif diff --git a/src/hb-ot-cff2-table.cc b/src/hb-ot-cff2-table.cc index a1aaef636..f1fa6ec30 100644 --- a/src/hb-ot-cff2-table.cc +++ b/src/hb-ot-cff2-table.cc @@ -27,6 +27,8 @@ #include "hb-ot-cff2-table.hh" #include "hb-cff2-interp-cs.hh" +#ifndef HB_NO_OT_FONT_CFF + using namespace CFF; struct extents_param_t @@ -139,3 +141,5 @@ bool OT::cff2::accelerator_t::get_extents (hb_font_t *font, return true; } + +#endif diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc index ab3ad0936..64b8b151b 100644 --- a/src/hb-subset-cff1.cc +++ b/src/hb-subset-cff1.cc @@ -32,6 +32,8 @@ #include "hb-subset-cff-common.hh" #include "hb-cff1-interp-cs.hh" +#ifndef HB_NO_SUBSET_CFF + using namespace CFF; struct remap_sid_t : remap_t @@ -1118,3 +1120,5 @@ hb_subset_cff1 (hb_subset_plan_t *plan, return result; } + +#endif diff --git a/src/hb-subset-cff2.cc b/src/hb-subset-cff2.cc index 9a03c3ed9..729457889 100644 --- a/src/hb-subset-cff2.cc +++ b/src/hb-subset-cff2.cc @@ -32,6 +32,8 @@ #include "hb-subset-cff-common.hh" #include "hb-cff2-interp-cs.hh" +#ifndef HB_NO_SUBSET_CFF + using namespace CFF; struct cff2_sub_table_offsets_t : cff_sub_table_offsets_t @@ -626,3 +628,5 @@ hb_subset_cff2 (hb_subset_plan_t *plan, return result; } + +#endif