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

Fix regressions introduced by sed. Ouch! 

Introduced in 99c2695759.
Broken mark-mark and mark-ligature stuff.
This commit is contained in:
Behdad Esfahbod 2012-06-08 10:43:49 -04:00
parent 0dd86f9f68
commit 68b76121f8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-ot-layout-gpos-table.hh
View File

@ -1068,7 +1068,7 @@ struct MarkLigPosFormat1
* can directly use the component index. If not, we attach the mark * can directly use the component index. If not, we attach the mark
* glyph to the last component of the ligature. */ * glyph to the last component of the ligature. */
if (get_lig_id (c->buffer->info[j]) && if (get_lig_id (c->buffer->info[j]) &&
get_lig_id (c->buffer->cur()) && get_lig_id (c->buffer->info[j]) == get_lig_id (c->buffer->cur()) &&
get_lig_comp (c->buffer->cur()) > 0) get_lig_comp (c->buffer->cur()) > 0)
{ {
comp_index = get_lig_comp (c->buffer->cur()) - 1; comp_index = get_lig_comp (c->buffer->cur()) - 1;
@ -1166,9 +1166,9 @@ struct MarkMarkPosFormat1
/* Two marks match only if they belong to the same base, or same component /* Two marks match only if they belong to the same base, or same component
* of the same ligature. That is, the component numbers must match, and * of the same ligature. That is, the component numbers must match, and
* if those are non-zero, the ligid number should also match. */ * if those are non-zero, the ligid number should also match. */
if ((get_lig_comp (c->buffer->cur())) || if ((get_lig_comp (c->buffer->info[j]) != get_lig_comp (c->buffer->cur())) ||
(get_lig_comp (c->buffer->info[j]) > 0 && (get_lig_comp (c->buffer->info[j]) > 0 &&
get_lig_id (c->buffer->cur()))) get_lig_id (c->buffer->info[j]) != get_lig_id (c->buffer->cur())))
return TRACE_RETURN (false); return TRACE_RETURN (false);
unsigned int mark2_index = (this+mark2Coverage) (c->buffer->info[j].codepoint); unsigned int mark2_index = (this+mark2Coverage) (c->buffer->info[j].codepoint);

2
src/hb-ot-layout-gsubgpos-private.hh
View File

@ -95,7 +95,7 @@ struct hb_closure_context_t
#endif #endif
#define TRACE_APPLY() \ #define TRACE_APPLY() \
hb_auto_trace_t<HB_DEBUG_APPLY> trace (&c->debug_depth, "APPLY", this, HB_FUNC, "idx %d codepoint %u", c->buffer->cur().codepoint); hb_auto_trace_t<HB_DEBUG_APPLY> trace (&c->debug_depth, "APPLY", this, HB_FUNC, "idx %d codepoint %u", c->buffer->idx, c->buffer->cur().codepoint);