[set] Minor touch-up on the previous commit

pull/3510/head
Behdad Esfahbod 3 years ago
parent a003fc0df1
commit 0a38878549
  1. 1
      docs/harfbuzz-sections.txt
  2. 10
      src/hb-bit-set-invertible.hh
  3. 12
      src/hb-bit-set.hh
  4. 6
      src/hb-set.cc
  5. 4
      src/hb-set.hh

@ -658,6 +658,7 @@ hb_set_is_equal
hb_set_is_subset
hb_set_next
hb_set_next_range
hb_set_next_many
hb_set_previous
hb_set_previous_range
hb_set_reference

@ -323,12 +323,12 @@ struct hb_bit_set_invertible_t
return true;
}
unsigned int set_next_many (hb_codepoint_t codepoint,
hb_codepoint_t *out,
unsigned int size) const
unsigned int next_many (hb_codepoint_t codepoint,
hb_codepoint_t *out,
unsigned int size) const
{
return inverted ? s.set_next_many_inverted(codepoint, out, size)
: s.set_next_many(codepoint, out, size);
return inverted ? s.next_many_inverted (codepoint, out, size)
: s.next_many (codepoint, out, size);
}
static constexpr hb_codepoint_t INVALID = hb_bit_set_t::INVALID;

@ -700,9 +700,9 @@ struct hb_bit_set_t
return true;
}
unsigned int set_next_many (hb_codepoint_t codepoint,
hb_codepoint_t *out,
unsigned int size) const
unsigned int next_many (hb_codepoint_t codepoint,
hb_codepoint_t *out,
unsigned int size) const
{
// By default, start at the first bit of the first page of values.
unsigned int start_page = 0;
@ -740,9 +740,9 @@ struct hb_bit_set_t
return initial_size - size;
}
unsigned int set_next_many_inverted (hb_codepoint_t codepoint,
hb_codepoint_t *out,
unsigned int size) const
unsigned int next_many_inverted (hb_codepoint_t codepoint,
hb_codepoint_t *out,
unsigned int size) const
{
unsigned int initial_size = size;
// By default, start at the first bit of the first page of values.

@ -619,8 +619,8 @@ hb_set_previous_range (const hb_set_t *set,
* hb_set_next_many:
* @set: A set
* @codepoint: Outputting codepoints starting after this one.
* Use HB_SET_VALUE_INVALID to get started.
* @out: An array of codepoints to write to.
* Use #HB_SET_VALUE_INVALID to get started.
* @out: (array length=size) An array of codepoints to write to.
* @size: The maximum number of codepoints to write out.
*
* Finds the next element in @set that is greater than @codepoint. Writes out
@ -637,5 +637,5 @@ hb_set_next_many (const hb_set_t *set,
hb_codepoint_t *out,
unsigned int size)
{
return set->set_next_many (codepoint, out, size);
return set->next_many (codepoint, out, size);
}

@ -139,8 +139,8 @@ struct hb_sparseset_t
{ return s.next_range (first, last); }
bool previous_range (hb_codepoint_t *first, hb_codepoint_t *last) const
{ return s.previous_range (first, last); }
unsigned int set_next_many (hb_codepoint_t codepoint, hb_codepoint_t *out, unsigned int size) const
{ return s.set_next_many(codepoint, out, size); }
unsigned int next_many (hb_codepoint_t codepoint, hb_codepoint_t *out, unsigned int size) const
{ return s.next_many (codepoint, out, size); }
unsigned int get_population () const { return s.get_population (); }
hb_codepoint_t get_min () const { return s.get_min (); }

Loading…
Cancel
Save