From 57051b4f672d7d9dd10c45cc95b1e50e32cd42a9 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Fri, 12 Jan 2018 11:42:25 +0100
Subject: [PATCH] [aat] Flush rest of buffer if state machine failed
---
src/hb-aat-layout-common-private.hh | 12 +++++++++---
src/hb-aat-layout-morx-table.hh | 2 ++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/hb-aat-layout-common-private.hh b/src/hb-aat-layout-common-private.hh
index 2dcbd557c..990be2e72 100644
--- a/src/hb-aat-layout-common-private.hh
+++ b/src/hb-aat-layout-common-private.hh
@@ -631,7 +631,7 @@ struct StateTableDriver
unsigned int count = buffer->len;
unsigned int state = 0;
bool last_was_dont_advance = false;
- for (buffer->idx = 0; buffer->idx <= count; buffer->idx++)
+ for (buffer->idx = 0; buffer->idx <= count;)
{
if (!state)
last_zero = buffer->idx;
@@ -655,7 +655,6 @@ struct StateTableDriver
if (likely (!dont_advance_set.has (key)))
{
dont_advance_set.add (key);
- buffer->idx--;
last_was_dont_advance = true;
}
else
@@ -664,10 +663,17 @@ struct StateTableDriver
else
last_was_dont_advance = false;
+ if (!last_was_dont_advance)
+ buffer->next_glyph ();
+
state = entry->newState;
}
- /* XXX finish if not in-place */
+ if (!c->in_place)
+ {
+ for (buffer->idx = 0; buffer->idx <= count;)
+ buffer->next_glyph ();
+ }
}
public:
diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh
index f24db56df..f07158944 100644
--- a/src/hb-aat-layout-morx-table.hh
+++ b/src/hb-aat-layout-morx-table.hh
@@ -42,6 +42,7 @@ struct RearrangementSubtable
{
struct driver_context_t
{
+ static const bool in_place = true;
enum Flags {
MarkFirst = 0x8000, /* If set, make the current glyph the first
* glyph to be rearranged. */
@@ -185,6 +186,7 @@ struct ContextualSubtable
struct driver_context_t
{
+ static const bool in_place = true;
enum Flags {
SetMark = 0x8000, /* If set, make the current glyph the marked glyph. */
DontAdvance = 0x4000, /* If set, don't advance to the next glyph before