Revert "[iter] Use && in uses of is_source_of"
This reverts commit ccbba667a9
.
This commit is contained in:
parent
ccbba667a9
commit
b57ea3b053
|
@ -94,7 +94,7 @@ struct AlternateSet
|
||||||
template <typename Iterator,
|
template <typename Iterator,
|
||||||
hb_requires (hb_is_source_of (Iterator, hb_codepoint_t))>
|
hb_requires (hb_is_source_of (Iterator, hb_codepoint_t))>
|
||||||
bool serialize (hb_serialize_context_t *c,
|
bool serialize (hb_serialize_context_t *c,
|
||||||
Iterator&& alts)
|
Iterator alts)
|
||||||
{
|
{
|
||||||
TRACE_SERIALIZE (this);
|
TRACE_SERIALIZE (this);
|
||||||
return_trace (alternates.serialize (c, alts));
|
return_trace (alternates.serialize (c, alts));
|
||||||
|
|
|
@ -149,7 +149,7 @@ struct Ligature
|
||||||
hb_requires (hb_is_source_of (Iterator, hb_codepoint_t))>
|
hb_requires (hb_is_source_of (Iterator, hb_codepoint_t))>
|
||||||
bool serialize (hb_serialize_context_t *c,
|
bool serialize (hb_serialize_context_t *c,
|
||||||
hb_codepoint_t ligature,
|
hb_codepoint_t ligature,
|
||||||
Iterator&& components /* Starting from second */)
|
Iterator components /* Starting from second */)
|
||||||
{
|
{
|
||||||
TRACE_SERIALIZE (this);
|
TRACE_SERIALIZE (this);
|
||||||
if (unlikely (!c->extend_min (this))) return_trace (false);
|
if (unlikely (!c->extend_min (this))) return_trace (false);
|
||||||
|
|
|
@ -132,7 +132,7 @@ struct Sequence
|
||||||
template <typename Iterator,
|
template <typename Iterator,
|
||||||
hb_requires (hb_is_source_of (Iterator, hb_codepoint_t))>
|
hb_requires (hb_is_source_of (Iterator, hb_codepoint_t))>
|
||||||
bool serialize (hb_serialize_context_t *c,
|
bool serialize (hb_serialize_context_t *c,
|
||||||
Iterator&& subst)
|
Iterator subst)
|
||||||
{
|
{
|
||||||
TRACE_SERIALIZE (this);
|
TRACE_SERIALIZE (this);
|
||||||
return_trace (substitute.serialize (c, subst));
|
return_trace (substitute.serialize (c, subst));
|
||||||
|
|
|
@ -106,7 +106,7 @@ struct SubstLookup : Lookup
|
||||||
bool serialize_single (hb_serialize_context_t *c,
|
bool serialize_single (hb_serialize_context_t *c,
|
||||||
uint32_t lookup_props,
|
uint32_t lookup_props,
|
||||||
Glyphs glyphs,
|
Glyphs glyphs,
|
||||||
Substitutes&& substitutes)
|
Substitutes substitutes)
|
||||||
{
|
{
|
||||||
TRACE_SERIALIZE (this);
|
TRACE_SERIALIZE (this);
|
||||||
if (unlikely (!Lookup::serialize (c, SubTable::Single, lookup_props, 1))) return_trace (false);
|
if (unlikely (!Lookup::serialize (c, SubTable::Single, lookup_props, 1))) return_trace (false);
|
||||||
|
|
|
@ -53,7 +53,7 @@ _add_head_and_set_loca_version (hb_subset_plan_t *plan, bool use_short_loca)
|
||||||
template<typename Iterator,
|
template<typename Iterator,
|
||||||
hb_requires (hb_is_source_of (Iterator, unsigned int))>
|
hb_requires (hb_is_source_of (Iterator, unsigned int))>
|
||||||
static bool
|
static bool
|
||||||
_add_loca_and_head (hb_subset_plan_t * plan, Iterator&& padded_offsets, bool use_short_loca)
|
_add_loca_and_head (hb_subset_plan_t * plan, Iterator padded_offsets, bool use_short_loca)
|
||||||
{
|
{
|
||||||
unsigned num_offsets = padded_offsets.len () + 1;
|
unsigned num_offsets = padded_offsets.len () + 1;
|
||||||
unsigned entry_size = use_short_loca ? 2 : 4;
|
unsigned entry_size = use_short_loca ? 2 : 4;
|
||||||
|
|
|
@ -122,7 +122,7 @@ typedef struct OpenTypeOffsetTable
|
||||||
hb_requires ((hb_is_source_of<Iterator, hb_pair_t<hb_tag_t, hb_blob_t *>>::value))>
|
hb_requires ((hb_is_source_of<Iterator, hb_pair_t<hb_tag_t, hb_blob_t *>>::value))>
|
||||||
bool serialize (hb_serialize_context_t *c,
|
bool serialize (hb_serialize_context_t *c,
|
||||||
hb_tag_t sfnt_tag,
|
hb_tag_t sfnt_tag,
|
||||||
Iterator&& it)
|
Iterator it)
|
||||||
{
|
{
|
||||||
TRACE_SERIALIZE (this);
|
TRACE_SERIALIZE (this);
|
||||||
/* Alloc 12 for the OTHeader. */
|
/* Alloc 12 for the OTHeader. */
|
||||||
|
@ -496,7 +496,7 @@ struct OpenTypeFontFile
|
||||||
hb_requires ((hb_is_source_of<Iterator, hb_pair_t<hb_tag_t, hb_blob_t *>>::value))>
|
hb_requires ((hb_is_source_of<Iterator, hb_pair_t<hb_tag_t, hb_blob_t *>>::value))>
|
||||||
bool serialize_single (hb_serialize_context_t *c,
|
bool serialize_single (hb_serialize_context_t *c,
|
||||||
hb_tag_t sfnt_tag,
|
hb_tag_t sfnt_tag,
|
||||||
Iterator&& items)
|
Iterator items)
|
||||||
{
|
{
|
||||||
TRACE_SERIALIZE (this);
|
TRACE_SERIALIZE (this);
|
||||||
assert (sfnt_tag != TTCTag);
|
assert (sfnt_tag != TTCTag);
|
||||||
|
|
|
@ -504,7 +504,7 @@ struct UnsizedArrayOf
|
||||||
}
|
}
|
||||||
template <typename Iterator,
|
template <typename Iterator,
|
||||||
hb_requires (hb_is_source_of (Iterator, Type))>
|
hb_requires (hb_is_source_of (Iterator, Type))>
|
||||||
bool serialize (hb_serialize_context_t *c, Iterator&& items)
|
bool serialize (hb_serialize_context_t *c, Iterator items)
|
||||||
{
|
{
|
||||||
TRACE_SERIALIZE (this);
|
TRACE_SERIALIZE (this);
|
||||||
unsigned count = items.len ();
|
unsigned count = items.len ();
|
||||||
|
@ -683,7 +683,7 @@ struct ArrayOf
|
||||||
}
|
}
|
||||||
template <typename Iterator,
|
template <typename Iterator,
|
||||||
hb_requires (hb_is_source_of (Iterator, Type))>
|
hb_requires (hb_is_source_of (Iterator, Type))>
|
||||||
HB_NODISCARD bool serialize (hb_serialize_context_t *c, Iterator&& items)
|
HB_NODISCARD bool serialize (hb_serialize_context_t *c, Iterator items)
|
||||||
{
|
{
|
||||||
TRACE_SERIALIZE (this);
|
TRACE_SERIALIZE (this);
|
||||||
unsigned count = items.len ();
|
unsigned count = items.len ();
|
||||||
|
@ -841,7 +841,7 @@ struct HeadlessArrayOf
|
||||||
}
|
}
|
||||||
template <typename Iterator,
|
template <typename Iterator,
|
||||||
hb_requires (hb_is_source_of (Iterator, Type))>
|
hb_requires (hb_is_source_of (Iterator, Type))>
|
||||||
bool serialize (hb_serialize_context_t *c, Iterator&& items)
|
bool serialize (hb_serialize_context_t *c, Iterator items)
|
||||||
{
|
{
|
||||||
TRACE_SERIALIZE (this);
|
TRACE_SERIALIZE (this);
|
||||||
unsigned count = items.len ();
|
unsigned count = items.len ();
|
||||||
|
|
|
@ -215,7 +215,7 @@ struct name
|
||||||
template <typename Iterator,
|
template <typename Iterator,
|
||||||
hb_requires (hb_is_source_of (Iterator, const NameRecord &))>
|
hb_requires (hb_is_source_of (Iterator, const NameRecord &))>
|
||||||
bool serialize (hb_serialize_context_t *c,
|
bool serialize (hb_serialize_context_t *c,
|
||||||
Iterator&& it,
|
Iterator it,
|
||||||
const void *src_string_pool)
|
const void *src_string_pool)
|
||||||
{
|
{
|
||||||
TRACE_SERIALIZE (this);
|
TRACE_SERIALIZE (this);
|
||||||
|
|
Loading…
Reference in New Issue