walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Streamline HB_NO_CFF

This commit is contained in:
Behdad Esfahbod 2019-06-18 13:07:44 -07:00
parent 60653a7adb
commit 737436d3f8
5 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hb-ot-cff1-table.cc
View File

@ -24,11 +24,13 @@
* Adobe Author(s): Michiharu Ariza
*/
#include "hb-ot-cff1-table.hh"
#include "hb-cff1-interp-cs.hh"
#include "hb.hh"
#ifndef HB_NO_CFF
#include "hb-ot-cff1-table.hh"
#include "hb-cff1-interp-cs.hh"
using namespace CFF;
/* SID to code */
@ -391,4 +393,5 @@ bool OT::cff1::accelerator_t::get_seac_components (hb_codepoint_t glyph, hb_code
return false;
}
#endif

7
src/hb-ot-cff2-table.cc
View File

@ -24,11 +24,13 @@
* Adobe Author(s): Michiharu Ariza
*/
#include "hb-ot-cff2-table.hh"
#include "hb-cff2-interp-cs.hh"
#include "hb.hh"
#ifndef HB_NO_OT_FONT_CFF
#include "hb-ot-cff2-table.hh"
#include "hb-cff2-interp-cs.hh"
using namespace CFF;
struct extents_param_t
@ -142,4 +144,5 @@ bool OT::cff2::accelerator_t::get_extents (hb_font_t *font,
return true;
}
#endif

7
src/hb-subset-cff-common.cc
View File

@ -24,6 +24,10 @@
* Adobe Author(s): Michiharu Ariza
*/
#include "hb.hh"
#ifndef HB_NO_SUBSET_CFF
#include "hb-ot-cff-common.hh"
#include "hb-ot-cff2-table.hh"
#include "hb-subset-cff-common.hh"
@ -223,3 +227,6 @@ hb_serialize_cff_fdselect (hb_serialize_context_t *c,
return_trace (false);
}
}
#endif

7
src/hb-subset-cff1.cc
View File

@ -24,6 +24,10 @@
* Adobe Author(s): Michiharu Ariza
*/
#include "hb.hh"
#ifndef HB_NO_SUBSET_CFF
#include "hb-open-type.hh"
#include "hb-ot-cff1-table.hh"
#include "hb-set.h"
@ -32,8 +36,6 @@
#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
@ -1121,4 +1123,5 @@ hb_subset_cff1 (hb_subset_plan_t *plan,
return result;
}
#endif

7
src/hb-subset-cff2.cc
View File

@ -24,6 +24,10 @@
* Adobe Author(s): Michiharu Ariza
*/
#include "hb.hh"
#ifndef HB_NO_SUBSET_CFF
#include "hb-open-type.hh"
#include "hb-ot-cff2-table.hh"
#include "hb-set.h"
@ -32,8 +36,6 @@
#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
@ -629,4 +631,5 @@ hb_subset_cff2 (hb_subset_plan_t *plan,
return result;
}
#endif