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

[morx] Only insert glyphs at mark when a mark has been set before

Browse Source 
This reverts commit f4072e8cb8.
https://github.com/harfbuzz/harfbuzz/issues/1195
This commit is contained in:
Sascha Brawer 2018-10-04 09:24:08 +02:00 committed by Behdad Esfahbod
parent 5de2d9cdbd
commit 7810bb1a59
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -592,6 +592,7 @@ struct InsertionSubtable
hb_aat_apply_context_t *c_) : hb_aat_apply_context_t *c_) :
ret (false), ret (false),
c (c_), c (c_),
mark_set (false),
mark (0), mark (0),
insertionAction (table+table->insertionAction) {} insertionAction (table+table->insertionAction) {}
@ -607,7 +608,7 @@ struct InsertionSubtable
hb_buffer_t *buffer = driver->buffer; hb_buffer_t *buffer = driver->buffer;
unsigned int flags = entry->flags; unsigned int flags = entry->flags;
if (entry->data.markedInsertIndex != 0xFFFF) if (entry->data.markedInsertIndex != 0xFFFF && mark_set)
{ {
unsigned int count = (flags & MarkedInsertCount); unsigned int count = (flags & MarkedInsertCount);
unsigned int start = entry->data.markedInsertIndex; unsigned int start = entry->data.markedInsertIndex;
@ -668,7 +669,10 @@ struct InsertionSubtable
} }
if (flags & SetMark) if (flags & SetMark)
{
mark_set = true;
mark = buffer->out_len; mark = buffer->out_len;
}
return true; return true;
} }
@ -677,6 +681,7 @@ struct InsertionSubtable
bool ret; bool ret;
private: private:
hb_aat_apply_context_t *c; hb_aat_apply_context_t *c;
bool mark_set;
unsigned int mark; unsigned int mark;
const UnsizedArrayOf<GlyphID> &insertionAction; const UnsizedArrayOf<GlyphID> &insertionAction;
}; };