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

[ot-face] Declare more tables as core

This commit is contained in:
Behdad Esfahbod 2022-11-24 13:38:53 -07:00
parent 5bc27a128d
commit e9f964c01a
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-machinery.hh
View File

@ -291,7 +291,7 @@ struct hb_table_lazy_loader_t : hb_lazy_loader_t<T,
{ {
auto c = hb_sanitize_context_t (); auto c = hb_sanitize_context_t ();
if (core) if (core)
c.set_num_glyphs (0); // So we don't recurse ad infinitum... c.set_num_glyphs (0); // So we don't recurse ad infinitum, or doesn't need num_glyphs
return c.reference_table<T> (face); return c.reference_table<T> (face);
} }
static void destroy (hb_blob_t *p) { hb_blob_destroy (p); } static void destroy (hb_blob_t *p) { hb_blob_destroy (p); }

28
src/hb-ot-face-table-list.hh
View File

@ -56,9 +56,9 @@ HB_OT_CORE_TABLE (OT, maxp)
#if !defined(HB_NO_FACE_COLLECT_UNICODES) || !defined(HB_NO_OT_FONT) #if !defined(HB_NO_FACE_COLLECT_UNICODES) || !defined(HB_NO_OT_FONT)
HB_OT_ACCELERATOR (OT, cmap) HB_OT_ACCELERATOR (OT, cmap)
#endif #endif
HB_OT_TABLE (OT, hhea) HB_OT_CORE_TABLE (OT, hhea)
HB_OT_ACCELERATOR (OT, hmtx) HB_OT_ACCELERATOR (OT, hmtx)
HB_OT_TABLE (OT, OS2) HB_OT_CORE_TABLE (OT, OS2)
#if !defined(HB_NO_OT_FONT_GLYPH_NAMES) || !defined(HB_NO_METRICS) || !defined(HB_NO_STYLE) #if !defined(HB_NO_OT_FONT_GLYPH_NAMES) || !defined(HB_NO_METRICS) || !defined(HB_NO_STYLE)
HB_OT_ACCELERATOR (OT, post) HB_OT_ACCELERATOR (OT, post)
#endif #endif
@ -66,7 +66,7 @@ HB_OT_ACCELERATOR (OT, post)
HB_OT_ACCELERATOR (OT, name) HB_OT_ACCELERATOR (OT, name)
#endif #endif
#ifndef HB_NO_STYLE #ifndef HB_NO_STYLE
HB_OT_TABLE (OT, STAT) HB_OT_CORE_TABLE (OT, STAT)
#endif #endif
#ifndef HB_NO_META #ifndef HB_NO_META
HB_OT_ACCELERATOR (OT, meta) HB_OT_ACCELERATOR (OT, meta)
@ -74,9 +74,9 @@ HB_OT_ACCELERATOR (OT, meta)
/* Vertical layout. */ /* Vertical layout. */
#ifndef HB_NO_VERTICAL #ifndef HB_NO_VERTICAL
HB_OT_TABLE (OT, vhea) HB_OT_CORE_TABLE (OT, vhea)
HB_OT_ACCELERATOR (OT, vmtx) HB_OT_ACCELERATOR (OT, vmtx)
HB_OT_TABLE (OT, VORG) HB_OT_CORE_TABLE (OT, VORG)
#endif #endif
/* TrueType outlines. */ /* TrueType outlines. */
@ -91,15 +91,15 @@ HB_OT_ACCELERATOR (OT, cff2)
/* OpenType variations. */ /* OpenType variations. */
#ifndef HB_NO_VAR #ifndef HB_NO_VAR
HB_OT_TABLE (OT, fvar) HB_OT_CORE_TABLE (OT, fvar)
HB_OT_TABLE (OT, avar) HB_OT_CORE_TABLE (OT, avar)
HB_OT_ACCELERATOR (OT, gvar) HB_OT_ACCELERATOR (OT, gvar)
HB_OT_TABLE (OT, MVAR) HB_OT_CORE_TABLE (OT, MVAR)
#endif #endif
/* Legacy kern. */ /* Legacy kern. */
#ifndef HB_NO_OT_KERN #ifndef HB_NO_OT_KERN
HB_OT_TABLE (OT, kern) HB_OT_CORE_TABLE (OT, kern)
#endif #endif
/* OpenType shaping. */ /* OpenType shaping. */
@ -107,12 +107,12 @@ HB_OT_TABLE (OT, kern)
HB_OT_ACCELERATOR (OT, GDEF) HB_OT_ACCELERATOR (OT, GDEF)
HB_OT_ACCELERATOR (OT, GSUB) HB_OT_ACCELERATOR (OT, GSUB)
HB_OT_ACCELERATOR (OT, GPOS) HB_OT_ACCELERATOR (OT, GPOS)
//HB_OT_TABLE (OT, JSTF) //HB_OT_CORE_TABLE (OT, JSTF)
#endif #endif
/* OpenType baseline. */ /* OpenType baseline. */
#ifndef HB_NO_BASE #ifndef HB_NO_BASE
HB_OT_TABLE (OT, BASE) HB_OT_CORE_TABLE (OT, BASE)
#endif #endif
/* AAT shaping. */ /* AAT shaping. */
@ -129,8 +129,8 @@ HB_OT_TABLE (AAT, feat)
/* OpenType color fonts. */ /* OpenType color fonts. */
#ifndef HB_NO_COLOR #ifndef HB_NO_COLOR
HB_OT_TABLE (OT, COLR) HB_OT_CORE_TABLE (OT, COLR)
HB_OT_TABLE (OT, CPAL) HB_OT_CORE_TABLE (OT, CPAL)
HB_OT_ACCELERATOR (OT, CBDT) HB_OT_ACCELERATOR (OT, CBDT)
HB_OT_ACCELERATOR (OT, sbix) HB_OT_ACCELERATOR (OT, sbix)
HB_OT_ACCELERATOR (OT, SVG) HB_OT_ACCELERATOR (OT, SVG)
@ -138,7 +138,7 @@ HB_OT_ACCELERATOR (OT, SVG)
/* OpenType math. */ /* OpenType math. */
#ifndef HB_NO_MATH #ifndef HB_NO_MATH
HB_OT_TABLE (OT, MATH) HB_OT_CORE_TABLE (OT, MATH)
#endif #endif