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

[Coverage] Internal renames

This commit is contained in:
Behdad Esfahbod 2022-07-21 12:14:06 -06:00
parent 84d38df828
commit b38587aa0b
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/OT/Layout/Common/Coverage.hh
View File

@ -242,11 +242,11 @@ struct Coverage
{ {
switch (format) switch (format)
{ {
case 1: return u.format1.more (); case 1: return u.format1.__more__ ();
case 2: return u.format2.more (); case 2: return u.format2.__more__ ();
#ifndef HB_NO_BORING_EXPANSION #ifndef HB_NO_BORING_EXPANSION
case 3: return u.format3.more (); case 3: return u.format3.__more__ ();
case 4: return u.format4.more (); case 4: return u.format4.__more__ ();
#endif #endif
default:return false; default:return false;
} }
@ -255,11 +255,11 @@ struct Coverage
{ {
switch (format) switch (format)
{ {
case 1: u.format1.next (); break; case 1: u.format1.__next__ (); break;
case 2: u.format2.next (); break; case 2: u.format2.__next__ (); break;
#ifndef HB_NO_BORING_EXPANSION #ifndef HB_NO_BORING_EXPANSION
case 3: u.format3.next (); break; case 3: u.format3.__next__ (); break;
case 4: u.format4.next (); break; case 4: u.format4.__next__ (); break;
#endif #endif
default: break; default: break;
} }

5
src/OT/Layout/Common/CoverageFormat1.hh
View File

@ -105,9 +105,8 @@ struct CoverageFormat1_3
struct iter_t struct iter_t
{ {
void init (const struct CoverageFormat1_3 &c_) { c = &c_; i = 0; } void init (const struct CoverageFormat1_3 &c_) { c = &c_; i = 0; }
void fini () {} bool __more__ () const { return i < c->glyphArray.len; }
bool more () const { return i < c->glyphArray.len; } void __next__ () { i++; }
void next () { i++; }
hb_codepoint_t get_glyph () const { return c->glyphArray[i]; } hb_codepoint_t get_glyph () const { return c->glyphArray[i]; }
bool operator != (const iter_t& o) const bool operator != (const iter_t& o) const
{ return i != o.i; } { return i != o.i; }

7
src/OT/Layout/Common/CoverageFormat2.hh
View File

@ -177,14 +177,13 @@ struct CoverageFormat2_4
j = 0; j = 0;
} }
} }
void fini () {} bool __more__ () const { return i < c->rangeRecord.len; }
bool more () const { return i < c->rangeRecord.len; } void __next__ ()
void next ()
{ {
if (j >= c->rangeRecord[i].last) if (j >= c->rangeRecord[i].last)
{ {
i++; i++;
if (more ()) if (__more__ ())
{ {
unsigned int old = coverage; unsigned int old = coverage;
j = c->rangeRecord[i].first; j = c->rangeRecord[i].first;