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

[reorg] Move SingleSubst opentype fields to top of the classes.

This commit is contained in:
Garret Rieger 2022-01-13 15:22:55 -08:00
parent 7dfd9e7001
commit 3ef180db44
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/OT/Layout/GSUB/SingleSubstFormat1.hh
View File

@ -10,6 +10,16 @@ namespace GSUB {
struct SingleSubstFormat1
{
protected:
HBUINT16 format; /* Format identifier--format = 1 */
Offset16To<Coverage>
coverage; /* Offset to Coverage table--from
* beginning of Substitution table */
HBUINT16 deltaGlyphID; /* Add to original GlyphID to get
* substitute GlyphID, modulo 0x10000 */
public:
bool intersects (const hb_set_t *glyphs) const
{ return (this+coverage).intersects (glyphs); }
@ -103,13 +113,6 @@ struct SingleSubstFormat1
return_trace (coverage.sanitize (c, this) && deltaGlyphID.sanitize (c));
}
protected:
HBUINT16 format; /* Format identifier--format = 1 */
Offset16To<Coverage>
coverage; /* Offset to Coverage table--from
* beginning of Substitution table */
HBUINT16 deltaGlyphID; /* Add to original GlyphID to get
* substitute GlyphID, modulo 0x10000 */
public:
DEFINE_SIZE_STATIC (6);
};

23
src/OT/Layout/GSUB/SingleSubstFormat2.hh
View File

@ -1,5 +1,5 @@
#ifndef OT_LAYOUT_GSUB_SINGLE_SUBST_FORMAT2
#define OT_LAYOUT_GSUB_SINGLE_SUBST_FORMAT2
#ifndef OT_LAYOUT_GSUB_SINGLE_SUBST_FORMAT_2
#define OT_LAYOUT_GSUB_SINGLE_SUBST_FORMAT_2
#include "Common.hh"
#include "hb-ot-layout-gsubgpos.hh"
@ -10,6 +10,17 @@ namespace GSUB {
struct SingleSubstFormat2
{
protected:
HBUINT16 format; /* Format identifier--format = 2 */
Offset16To<Coverage>
coverage; /* Offset to Coverage table--from
* beginning of Substitution table */
Array16Of<HBGlyphID16>
substitute; /* Array of substitute
* GlyphIDs--ordered by Coverage Index */
public:
bool intersects (const hb_set_t *glyphs) const
{ return (this+coverage).intersects (glyphs); }
@ -101,14 +112,6 @@ struct SingleSubstFormat2
return_trace (coverage.sanitize (c, this) && substitute.sanitize (c));
}
protected:
HBUINT16 format; /* Format identifier--format = 2 */
Offset16To<Coverage>
coverage; /* Offset to Coverage table--from
* beginning of Substitution table */
Array16Of<HBGlyphID16>
substitute; /* Array of substitute
* GlyphIDs--ordered by Coverage Index */
public:
DEFINE_SIZE_ARRAY (6, substitute);
};