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

Free up hb-ot-face.hh from includes 

There might be a better way to do this, but I couldn't find...
This commit is contained in:
Behdad Esfahbod 2018-08-26 15:11:24 -07:00
parent a84309afc8
commit 3a0b3a29cc
13 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hb-face.cc
View File

@ -32,6 +32,7 @@
#include "hb-blob.hh" #include "hb-blob.hh"
#include "hb-open-file.hh" #include "hb-open-file.hh"
#include "hb-ot-face.hh" #include "hb-ot-face.hh"
#include "hb-ot-cmap-table.hh"
/** /**

1
src/hb-ot-cmap-table.hh
View File

@ -1173,6 +1173,7 @@ struct cmap
DEFINE_SIZE_ARRAY (4, encodingRecord); DEFINE_SIZE_ARRAY (4, encodingRecord);
}; };
struct cmap_accelerator_t : cmap::accelerator_t {};
} /* namespace OT */ } /* namespace OT */

2
src/hb-ot-color-cbdt-table.hh
View File

@ -533,6 +533,8 @@ struct CBDT
DEFINE_SIZE_ARRAY(4, dataZ); DEFINE_SIZE_ARRAY(4, dataZ);
}; };
struct CBDT_accelerator_t : CBDT::accelerator_t {};
} /* namespace OT */ } /* namespace OT */
#endif /* HB_OT_COLOR_CBDT_TABLE_HH */ #endif /* HB_OT_COLOR_CBDT_TABLE_HH */

10
src/hb-ot-face.cc
View File

@ -26,6 +26,16 @@
#include "hb-ot-face.hh" #include "hb-ot-face.hh"
#include "hb-ot-cmap-table.hh"
#include "hb-ot-glyf-table.hh"
#include "hb-ot-hmtx-table.hh"
#include "hb-ot-kern-table.hh"
#include "hb-ot-post-table.hh"
#include "hb-ot-color-cbdt-table.hh"
#include "hb-ot-layout-gdef-table.hh"
#include "hb-ot-layout-gsub-table.hh"
#include "hb-ot-layout-gpos-table.hh"
void hb_ot_face_data_t::tables_t::init0 (hb_face_t *face) void hb_ot_face_data_t::tables_t::init0 (hb_face_t *face)
{ {

15
src/hb-ot-face.hh
View File

@ -37,17 +37,6 @@
#define hb_ot_face_data(face) ((hb_ot_face_data_t *) face->shaper_data.ot.get_relaxed ()) #define hb_ot_face_data(face) ((hb_ot_face_data_t *) face->shaper_data.ot.get_relaxed ())
#include "hb-ot-cmap-table.hh"
#include "hb-ot-glyf-table.hh"
#include "hb-ot-hmtx-table.hh"
#include "hb-ot-kern-table.hh"
#include "hb-ot-post-table.hh"
#include "hb-ot-color-cbdt-table.hh"
#include "hb-ot-layout-gdef-table.hh"
#include "hb-ot-layout-gsub-table.hh"
#include "hb-ot-layout-gpos-table.hh"
/* /*
* hb_ot_face_data_t * hb_ot_face_data_t
*/ */
@ -84,7 +73,7 @@
/* Declare tables. */ /* Declare tables. */
#define HB_OT_LAYOUT_TABLE(Namespace, Type) namespace Namespace { struct Type; } #define HB_OT_LAYOUT_TABLE(Namespace, Type) namespace Namespace { struct Type; }
#define HB_OT_LAYOUT_ACCELERATOR(Namespace, Type) HB_OT_LAYOUT_TABLE (Namespace, Type) #define HB_OT_LAYOUT_ACCELERATOR(Namespace, Type) HB_OT_LAYOUT_TABLE (Namespace, Type##_accelerator_t)
HB_OT_LAYOUT_TABLES HB_OT_LAYOUT_TABLES
#undef HB_OT_LAYOUT_ACCELERATOR #undef HB_OT_LAYOUT_ACCELERATOR
#undef HB_OT_LAYOUT_TABLE #undef HB_OT_LAYOUT_TABLE
@ -113,7 +102,7 @@ struct hb_ot_face_data_t
#define HB_OT_LAYOUT_TABLE(Namespace, Type) \ #define HB_OT_LAYOUT_TABLE(Namespace, Type) \
hb_table_lazy_loader_t<Namespace::Type, HB_OT_LAYOUT_TABLE_ORDER (Namespace, Type)> Type; hb_table_lazy_loader_t<Namespace::Type, HB_OT_LAYOUT_TABLE_ORDER (Namespace, Type)> Type;
#define HB_OT_LAYOUT_ACCELERATOR(Namespace, Type) \ #define HB_OT_LAYOUT_ACCELERATOR(Namespace, Type) \
hb_face_lazy_loader_t<Namespace::Type::accelerator_t, HB_OT_LAYOUT_TABLE_ORDER (Namespace, Type)> Type; hb_face_lazy_loader_t<Namespace::Type##_accelerator_t, HB_OT_LAYOUT_TABLE_ORDER (Namespace, Type)> Type;
HB_OT_LAYOUT_TABLES HB_OT_LAYOUT_TABLES
#undef HB_OT_LAYOUT_ACCELERATOR #undef HB_OT_LAYOUT_ACCELERATOR
#undef HB_OT_LAYOUT_TABLE #undef HB_OT_LAYOUT_TABLE

7
src/hb-ot-font.cc
View File

@ -32,6 +32,13 @@
#include "hb-machinery.hh" #include "hb-machinery.hh"
#include "hb-ot-face.hh" #include "hb-ot-face.hh"
#include "hb-ot-cmap-table.hh"
#include "hb-ot-hmtx-table.hh"
#include "hb-ot-kern-table.hh"
#include "hb-ot-post-table.hh"
#include "hb-ot-glyf-table.hh"
#include "hb-ot-color-cbdt-table.hh"
typedef hb_ot_face_data_t::tables_t hb_ot_font_t; typedef hb_ot_face_data_t::tables_t hb_ot_font_t;

2
src/hb-ot-glyf-table.hh
View File

@ -490,6 +490,8 @@ struct glyf
DEFINE_SIZE_ARRAY (0, dataZ); DEFINE_SIZE_ARRAY (0, dataZ);
}; };
struct glyf_accelerator_t : glyf::accelerator_t {};
} /* namespace OT */ } /* namespace OT */

3
src/hb-ot-hmtx-table.hh
View File

@ -332,6 +332,9 @@ struct vmtx : hmtxvmtx<vmtx, vhea> {
static const hb_tag_t os2Tag = HB_TAG_NONE; static const hb_tag_t os2Tag = HB_TAG_NONE;
}; };
struct hmtx_accelerator_t : hmtx::accelerator_t {};
struct vmtx_accelerator_t : vmtx::accelerator_t {};
} /* namespace OT */ } /* namespace OT */

2
src/hb-ot-kern-table.hh
View File

@ -390,6 +390,8 @@ struct kern
DEFINE_SIZE_UNION (2, major); DEFINE_SIZE_UNION (2, major);
}; };
struct kern_accelerator_t : kern::accelerator_t {};
} /* namespace OT */ } /* namespace OT */

1
src/hb-ot-layout-gdef-table.hh
View File

@ -467,6 +467,7 @@ struct GDEF
DEFINE_SIZE_MIN (12); DEFINE_SIZE_MIN (12);
}; };
struct GDEF_accelerator_t : GDEF::accelerator_t {};
} /* namespace OT */ } /* namespace OT */

2
src/hb-ot-layout-gpos-table.hh
View File

@ -1647,6 +1647,8 @@ template <typename context_t>
return ret; return ret;
} }
struct GPOS_accelerator_t : GPOS::accelerator_t {};
#undef attach_chain #undef attach_chain
#undef attach_type #undef attach_type

1
src/hb-ot-layout-gsub-table.hh
View File

@ -1350,6 +1350,7 @@ template <typename context_t>
return ret; return ret;
} }
struct GSUB_accelerator_t : GSUB::accelerator_t {};
} /* namespace OT */ } /* namespace OT */

2
src/hb-ot-post-table.hh
View File

@ -295,6 +295,8 @@ struct post
DEFINE_SIZE_STATIC (32); DEFINE_SIZE_STATIC (32);
}; };
struct post_accelerator_t : post::accelerator_t {};
} /* namespace OT */ } /* namespace OT */