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

[config] Add HB_NO_CMAP_LEGACY_SUBTABLES 

Part of https://vimeo.com/331852453/06eec89c65
This commit is contained in:
Behdad Esfahbod 2019-06-19 19:50:54 -07:00
parent 8e3cde67df
commit 3caa32d737
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hb-config.hh
View File

@ -106,6 +106,7 @@
#endif #endif
#ifdef HB_NO_LEGACY #ifdef HB_NO_LEGACY
#define HB_NO_CMAP_LEGACY_SUBTABLES
#define HB_NO_FALLBACK_SHAPE #define HB_NO_FALLBACK_SHAPE
#define HB_NO_OT_KERN #define HB_NO_OT_KERN
#define HB_NO_OT_LAYOUT_BLACKLIST #define HB_NO_OT_LAYOUT_BLACKLIST

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

@ -756,10 +756,12 @@ struct CmapSubtable
hb_codepoint_t *glyph) const hb_codepoint_t *glyph) const
{ {
switch (u.format) { switch (u.format) {
#ifndef HB_NO_CMAP_LEGACY_SUBTABLES
case 0: return u.format0 .get_glyph (codepoint, glyph); case 0: return u.format0 .get_glyph (codepoint, glyph);
case 4: return u.format4 .get_glyph (codepoint, glyph);
case 6: return u.format6 .get_glyph (codepoint, glyph); case 6: return u.format6 .get_glyph (codepoint, glyph);
case 10: return u.format10.get_glyph (codepoint, glyph); case 10: return u.format10.get_glyph (codepoint, glyph);
#endif
case 4: return u.format4 .get_glyph (codepoint, glyph);
case 12: return u.format12.get_glyph (codepoint, glyph); case 12: return u.format12.get_glyph (codepoint, glyph);
case 13: return u.format13.get_glyph (codepoint, glyph); case 13: return u.format13.get_glyph (codepoint, glyph);
case 14: case 14:
@ -769,10 +771,12 @@ struct CmapSubtable
void collect_unicodes (hb_set_t *out) const void collect_unicodes (hb_set_t *out) const
{ {
switch (u.format) { switch (u.format) {
#ifndef HB_NO_CMAP_LEGACY_SUBTABLES
case 0: u.format0 .collect_unicodes (out); return; case 0: u.format0 .collect_unicodes (out); return;
case 4: u.format4 .collect_unicodes (out); return;
case 6: u.format6 .collect_unicodes (out); return; case 6: u.format6 .collect_unicodes (out); return;
case 10: u.format10.collect_unicodes (out); return; case 10: u.format10.collect_unicodes (out); return;
#endif
case 4: u.format4 .collect_unicodes (out); return;
case 12: u.format12.collect_unicodes (out); return; case 12: u.format12.collect_unicodes (out); return;
case 13: u.format13.collect_unicodes (out); return; case 13: u.format13.collect_unicodes (out); return;
case 14: case 14:
@ -785,10 +789,12 @@ struct CmapSubtable
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
if (!u.format.sanitize (c)) return_trace (false); if (!u.format.sanitize (c)) return_trace (false);
switch (u.format) { switch (u.format) {
#ifndef HB_NO_CMAP_LEGACY_SUBTABLES
case 0: return_trace (u.format0 .sanitize (c)); case 0: return_trace (u.format0 .sanitize (c));
case 4: return_trace (u.format4 .sanitize (c));
case 6: return_trace (u.format6 .sanitize (c)); case 6: return_trace (u.format6 .sanitize (c));
case 10: return_trace (u.format10.sanitize (c)); case 10: return_trace (u.format10.sanitize (c));
#endif
case 4: return_trace (u.format4 .sanitize (c));
case 12: return_trace (u.format12.sanitize (c)); case 12: return_trace (u.format12.sanitize (c));
case 13: return_trace (u.format13.sanitize (c)); case 13: return_trace (u.format13.sanitize (c));
case 14: return_trace (u.format14.sanitize (c)); case 14: return_trace (u.format14.sanitize (c));
@ -799,10 +805,12 @@ struct CmapSubtable
public: public:
union { union {
HBUINT16 format; /* Format identifier */ HBUINT16 format; /* Format identifier */
#ifndef HB_NO_CMAP_LEGACY_SUBTABLES
CmapSubtableFormat0 format0; CmapSubtableFormat0 format0;
CmapSubtableFormat4 format4;
CmapSubtableFormat6 format6; CmapSubtableFormat6 format6;
CmapSubtableFormat10 format10; CmapSubtableFormat10 format10;
#endif
CmapSubtableFormat4 format4;
CmapSubtableFormat12 format12; CmapSubtableFormat12 format12;
CmapSubtableFormat13 format13; CmapSubtableFormat13 format13;
CmapSubtableFormat14 format14; CmapSubtableFormat14 format14;