[aat] Remove another unused parameter

One logic change, but should be fine.
pull/5041/head
Behdad Esfahbod 2 weeks ago
parent d9058c64e0
commit 9f38690e8e
  1. 8
      src/hb-aat-layout-common.hh
  2. 6
      src/hb-aat-layout-kerx-table.hh
  3. 15
      src/hb-aat-layout-morx-table.hh

@ -939,7 +939,7 @@ struct StateTableDriver
bool is_idempotent_on_all_out_of_bounds (context_t *c, hb_aat_apply_context_t *ac)
{
const auto entry = machine.get_entry (StateTableT::STATE_START_OF_TEXT, CLASS_OUT_OF_BOUNDS);
return !c->is_actionable (ac->buffer, entry) &&
return !c->is_actionable (entry) &&
machine.new_state (entry.newState) == StateTableT::STATE_START_OF_TEXT;
}
@ -1021,7 +1021,7 @@ struct StateTableDriver
bool is_safe_to_break =
(
/* 1. */
!c->is_actionable (buffer, entry) &&
!c->is_actionable (entry) &&
/* 2. */
// This one is meh, I know...
@ -1033,7 +1033,7 @@ struct StateTableDriver
wouldbe_entry = &machine.get_entry(StateTableT::STATE_START_OF_TEXT, klass)
,
/* 2c'. */
!c->is_actionable (buffer, *wouldbe_entry) &&
!c->is_actionable (*wouldbe_entry) &&
/* 2c". */
(
next_state == machine.new_state(wouldbe_entry->newState) &&
@ -1043,7 +1043,7 @@ struct StateTableDriver
) &&
/* 3. */
!c->is_actionable (buffer, machine.get_entry (state, CLASS_END_OF_TEXT))
!c->is_actionable (machine.get_entry (state, CLASS_END_OF_TEXT))
);
if (!is_safe_to_break && buffer->backtrack_len () && buffer->idx < buffer->len)

@ -242,8 +242,7 @@ struct KerxSubTableFormat1
depth (0),
crossStream (table->header.coverage & table->header.CrossStream) {}
bool is_actionable (hb_buffer_t *buffer HB_UNUSED,
const Entry<EntryData> &entry)
bool is_actionable (const Entry<EntryData> &entry)
{ return Format1EntryT::performAction (entry); }
void transition (hb_buffer_t *buffer,
StateTableDriver<Types, EntryData> *driver,
@ -527,8 +526,7 @@ struct KerxSubTableFormat4
mark_set (false),
mark (0) {}
bool is_actionable (hb_buffer_t *buffer HB_UNUSED,
const Entry<EntryData> &entry)
bool is_actionable (const Entry<EntryData> &entry)
{ return entry.data.ankrActionIndex != 0xFFFF; }
void transition (hb_buffer_t *buffer,
StateTableDriver<Types, EntryData> *driver,

@ -74,8 +74,7 @@ struct RearrangementSubtable
ret (false),
start (0), end (0) {}
bool is_actionable (hb_buffer_t *buffer HB_UNUSED,
const Entry<EntryData> &entry) const
bool is_actionable (const Entry<EntryData> &entry) const
{
return (entry.flags & Verb) && start < end;
}
@ -231,12 +230,8 @@ struct ContextualSubtable
table (table_),
subs (table+table->substitutionTables) {}
bool is_actionable (hb_buffer_t *buffer,
const Entry<EntryData> &entry) const
bool is_actionable (const Entry<EntryData> &entry) const
{
if (buffer->idx == buffer->len && !mark_set)
return false;
return entry.data.markIndex != 0xFFFF || entry.data.currentIndex != 0xFFFF;
}
void transition (hb_buffer_t *buffer,
@ -482,8 +477,7 @@ struct LigatureSubtable
ligature (table+table->ligature),
match_length (0) {}
bool is_actionable (hb_buffer_t *buffer HB_UNUSED,
const Entry<EntryData> &entry) const
bool is_actionable (const Entry<EntryData> &entry) const
{
return LigatureEntryT::performAction (entry);
}
@ -791,8 +785,7 @@ struct InsertionSubtable
mark (0),
insertionAction (table+table->insertionAction) {}
bool is_actionable (hb_buffer_t *buffer HB_UNUSED,
const Entry<EntryData> &entry) const
bool is_actionable (const Entry<EntryData> &entry) const
{
return (entry.flags & (CurrentInsertCount | MarkedInsertCount)) &&
(entry.data.currentInsertIndex != 0xFFFF ||entry.data.markedInsertIndex != 0xFFFF);

Loading…
Cancel
Save