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

[>64k:layout] Templatize PairPosFormat1

This commit is contained in:
Behdad Esfahbod 2022-07-07 16:27:49 -06:00
parent e9f8010fd0
commit 298ee47c55
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OT/Layout/GPOS/PairPos.hh
View File

@ -13,7 +13,7 @@ struct PairPos
protected: protected:
union { union {
HBUINT16 format; /* Format identifier */ HBUINT16 format; /* Format identifier */
PairPosFormat1 format1; PairPosFormat1_3<SmallTypes> format1;
PairPosFormat2_4<SmallTypes> format2; PairPosFormat2_4<SmallTypes> format2;
#ifndef HB_NO_BORING_EXPANSION #ifndef HB_NO_BORING_EXPANSION
PairPosFormat2_4<MediumTypes> format4; PairPosFormat2_4<MediumTypes> format4;

8
src/OT/Layout/GPOS/PairPosFormat1.hh
View File

@ -8,8 +8,12 @@ namespace Layout {
namespace GPOS_impl { namespace GPOS_impl {
struct PairPosFormat1 template <typename Types>
struct PairPosFormat1_3
{ {
using PairSet = GPOS_impl::PairSet<Types>;
using PairValueRecord = GPOS_impl::PairValueRecord<Types>;
protected: protected:
HBUINT16 format; /* Format identifier--format = 1 */ HBUINT16 format; /* Format identifier--format = 1 */
Offset16To<Coverage> Offset16To<Coverage>
@ -35,7 +39,7 @@ struct PairPosFormat1
unsigned int len1 = valueFormat[0].get_len (); unsigned int len1 = valueFormat[0].get_len ();
unsigned int len2 = valueFormat[1].get_len (); unsigned int len2 = valueFormat[1].get_len ();
PairSet::sanitize_closure_t closure = typename PairSet::sanitize_closure_t closure =
{ {
valueFormat, valueFormat,
len1, len1,

8
src/OT/Layout/GPOS/PairSet.hh
View File

@ -8,9 +8,13 @@ namespace Layout {
namespace GPOS_impl { namespace GPOS_impl {
template <typename Types>
struct PairSet struct PairSet
{ {
friend struct PairPosFormat1; template <typename Types2>
friend struct PairPosFormat1_3;
using PairValueRecord = GPOS_impl::PairValueRecord<Types>;
protected: protected:
HBUINT16 len; /* Number of PairValueRecords */ HBUINT16 len; /* Number of PairValueRecords */
@ -136,7 +140,7 @@ struct PairSet
unsigned len2 = valueFormats[1].get_len (); unsigned len2 = valueFormats[1].get_len ();
unsigned record_size = HBUINT16::static_size + Value::static_size * (len1 + len2); unsigned record_size = HBUINT16::static_size + Value::static_size * (len1 + len2);
PairValueRecord::context_t context = typename PairValueRecord::context_t context =
{ {
this, this,
valueFormats, valueFormats,

7
src/OT/Layout/GPOS/PairValueRecord.hh
View File

@ -6,18 +6,21 @@ namespace Layout {
namespace GPOS_impl { namespace GPOS_impl {
template <typename Types>
struct PairValueRecord struct PairValueRecord
{ {
template <typename Types2>
friend struct PairSet; friend struct PairSet;
protected: protected:
HBGlyphID16 secondGlyph; /* GlyphID of second glyph in the typename Types::HBGlyphID
secondGlyph; /* GlyphID of second glyph in the
* pair--first glyph is listed in the * pair--first glyph is listed in the
* Coverage table */ * Coverage table */
ValueRecord values; /* Positioning data for the first glyph ValueRecord values; /* Positioning data for the first glyph
* followed by for second glyph */ * followed by for second glyph */
public: public:
DEFINE_SIZE_ARRAY (2, values); DEFINE_SIZE_ARRAY (Types::size, values);
int cmp (hb_codepoint_t k) const int cmp (hb_codepoint_t k) const
{ return secondGlyph.cmp (k); } { return secondGlyph.cmp (k); }