From dd38db523a1001178bf4cae3721c098466534736 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 12 Jan 2018 09:45:42 +0100 Subject: [PATCH] [aat] Fix more builds Maybe I should disable C++11 detection such that my compiler also catches these. Doesn't look like we can switch to it for a while anyway... --- src/hb-aat-layout-common-private.hh | 2 +- src/hb-aat-layout-morx-table.hh | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/hb-aat-layout-common-private.hh b/src/hb-aat-layout-common-private.hh index 04007db34..4ed2d3a18 100644 --- a/src/hb-aat-layout-common-private.hh +++ b/src/hb-aat-layout-common-private.hh @@ -637,7 +637,7 @@ struct StateTableDriver c->transition (this, entry); - if (entry->flags & context_t::Flags::DontAdvance) + if (entry->flags & context_t::DontAdvance) buffer->idx--; /* TODO Detect infinite loop. */ state = entry->newState; diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh index f4f03ab8c..080f90eed 100644 --- a/src/hb-aat-layout-morx-table.hh +++ b/src/hb-aat-layout-morx-table.hh @@ -43,16 +43,16 @@ struct RearrangementSubtable struct driver_context_t { enum Flags { - MarkFirst = 0x8000, /* If set, make the current glyph the first - * glyph to be rearranged. */ + MarkFirst = 0x8000, /* If set, make the current glyph the first + * glyph to be rearranged. */ DontAdvance = 0x4000, /* If set, don't advance to the next glyph - * before going to the new state. This means - * that the glyph index doesn't change, even - * if the glyph at that index has changed. */ - MarkLast = 0x2000, /* If set, make the current glyph the last - * glyph to be rearranged. */ - Reserved = 0x1FF0, /* These bits are reserved and should be set to 0. */ - Verb = 0x000F, /* The type of rearrangement specified. */ + * before going to the new state. This means + * that the glyph index doesn't change, even + * if the glyph at that index has changed. */ + MarkLast = 0x2000, /* If set, make the current glyph the last + * glyph to be rearranged. */ + Reserved = 0x1FF0, /* These bits are reserved and should be set to 0. */ + Verb = 0x000F, /* The type of rearrangement specified. */ }; inline driver_context_t (const RearrangementSubtable *table) :