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

[glyf] Rename get_iterator() to iter() 

That's the standard name.
This commit is contained in:
Behdad Esfahbod 2022-06-25 18:31:31 -06:00
parent 11d2670676
commit 449bdeed5f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/OT/glyf/CompositeGlyph.hh
View File

@ -25,7 +25,7 @@ struct CompositeGlyphChain
USE_MY_METRICS = 0x0200, USE_MY_METRICS = 0x0200,
OVERLAP_COMPOUND = 0x0400, OVERLAP_COMPOUND = 0x0400,
SCALED_COMPONENT_OFFSET = 0x0800, SCALED_COMPONENT_OFFSET = 0x0800,
UNSCALED_COMPONENT_OFFSET = 0x1000 UNSCALED_COMPONENT_OFFSET = 0x1000
}; };
public: public:
@ -211,7 +211,7 @@ struct CompositeGlyph
CompositeGlyph (const GlyphHeader &header_, hb_bytes_t bytes_) : CompositeGlyph (const GlyphHeader &header_, hb_bytes_t bytes_) :
header (header_), bytes (bytes_) {} header (header_), bytes (bytes_) {}
composite_iter_t get_iterator () const composite_iter_t iter () const
{ return composite_iter_t (bytes, &StructAfter<CompositeGlyphChain, GlyphHeader> (header)); } { return composite_iter_t (bytes, &StructAfter<CompositeGlyphChain, GlyphHeader> (header)); }
unsigned int instructions_length (hb_bytes_t bytes) const unsigned int instructions_length (hb_bytes_t bytes) const
@ -219,7 +219,7 @@ struct CompositeGlyph
unsigned int start = bytes.length; unsigned int start = bytes.length;
unsigned int end = bytes.length; unsigned int end = bytes.length;
const CompositeGlyphChain *last = nullptr; const CompositeGlyphChain *last = nullptr;
for (auto &item : get_iterator ()) for (auto &item : iter ())
last = &item; last = &item;
if (unlikely (!last)) return 0; if (unlikely (!last)) return 0;
@ -235,7 +235,7 @@ struct CompositeGlyph
void drop_hints () void drop_hints ()
{ {
for (const auto &_ : get_iterator ()) for (const auto &_ : iter ())
const_cast<CompositeGlyphChain &> (_).drop_instructions_flag (); const_cast<CompositeGlyphChain &> (_).drop_instructions_flag ();
} }

4
src/OT/glyf/Glyph.hh
View File

@ -33,7 +33,7 @@ struct Glyph
composite_iter_t get_composite_iterator () const composite_iter_t get_composite_iterator () const
{ {
if (type != COMPOSITE) return composite_iter_t (); if (type != COMPOSITE) return composite_iter_t ();
return CompositeGlyph (*header, bytes).get_iterator (); return CompositeGlyph (*header, bytes).iter ();
} }
const hb_bytes_t trim_padding () const const hb_bytes_t trim_padding () const
@ -88,7 +88,7 @@ struct Glyph
case COMPOSITE: case COMPOSITE:
{ {
/* pseudo component points for each component in composite glyph */ /* pseudo component points for each component in composite glyph */
unsigned num_points = hb_len (CompositeGlyph (*header, bytes).get_iterator ()); unsigned num_points = hb_len (CompositeGlyph (*header, bytes).iter ());
if (unlikely (!points.resize (num_points))) return false; if (unlikely (!points.resize (num_points))) return false;
for (unsigned i = 0; i < points.length; i++) for (unsigned i = 0; i < points.length; i++)
points[i].init (); points[i].init ();