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

[aat] Flush rest of buffer if state machine failed

This commit is contained in:
Behdad Esfahbod 2018-01-12 11:42:25 +01:00
parent 369dfab0f8
commit 57051b4f67
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hb-aat-layout-common-private.hh
View File

@ -631,7 +631,7 @@ struct StateTableDriver
unsigned int count = buffer->len; unsigned int count = buffer->len;
unsigned int state = 0; unsigned int state = 0;
bool last_was_dont_advance = false; bool last_was_dont_advance = false;
for (buffer->idx = 0; buffer->idx <= count; buffer->idx++) for (buffer->idx = 0; buffer->idx <= count;)
{ {
if (!state) if (!state)
last_zero = buffer->idx; last_zero = buffer->idx;
@ -655,7 +655,6 @@ struct StateTableDriver
if (likely (!dont_advance_set.has (key))) if (likely (!dont_advance_set.has (key)))
{ {
dont_advance_set.add (key); dont_advance_set.add (key);
buffer->idx--;
last_was_dont_advance = true; last_was_dont_advance = true;
} }
else else
@ -664,10 +663,17 @@ struct StateTableDriver
else else
last_was_dont_advance = false; last_was_dont_advance = false;
if (!last_was_dont_advance)
buffer->next_glyph ();
state = entry->newState; state = entry->newState;
} }
/* XXX finish if not in-place */ if (!c->in_place)
{
for (buffer->idx = 0; buffer->idx <= count;)
buffer->next_glyph ();
}
} }
public: public:

2
src/hb-aat-layout-morx-table.hh
View File

@ -42,6 +42,7 @@ struct RearrangementSubtable
{ {
struct driver_context_t struct driver_context_t
{ {
static const bool in_place = true;
enum Flags { enum Flags {
MarkFirst = 0x8000, /* If set, make the current glyph the first MarkFirst = 0x8000, /* If set, make the current glyph the first
* glyph to be rearranged. */ * glyph to be rearranged. */
@ -185,6 +186,7 @@ struct ContextualSubtable
struct driver_context_t struct driver_context_t
{ {
static const bool in_place = true;
enum Flags { enum Flags {
SetMark = 0x8000, /* If set, make the current glyph the marked glyph. */ SetMark = 0x8000, /* If set, make the current glyph the marked glyph. */
DontAdvance = 0x4000, /* If set, don't advance to the next glyph before DontAdvance = 0x4000, /* If set, don't advance to the next glyph before