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

tweaked --desubroutinize to remove hintmask only subrs

This commit is contained in:
Michiharu Ariza 2019-02-12 15:10:43 -08:00
parent d9ded06992
commit c6af846178
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hb-subset-cff-common.hh
View File

@ -797,10 +797,12 @@ struct subr_subsetter_t
drop_hints_param_t () drop_hints_param_t ()
: seen_moveto (false), : seen_moveto (false),
ends_in_hint (false), ends_in_hint (false),
all_dropped (false),
vsindex_dropped (false) {} vsindex_dropped (false) {}
bool seen_moveto; bool seen_moveto;
bool ends_in_hint; bool ends_in_hint;
bool all_dropped;
bool vsindex_dropped; bool vsindex_dropped;
}; };
@ -811,7 +813,7 @@ struct subr_subsetter_t
drop.ends_in_hint = false; drop.ends_in_hint = false;
bool has_hint = drop_hints_in_str (subrs[subr_num], param, drop); bool has_hint = drop_hints_in_str (subrs[subr_num], param, drop);
/* if this subr ends with a stem hint (i.e., not a number a potential argument for moveto), /* if this subr ends with a stem hint (i.e., not a number; potential argument for moveto),
* then this entire subroutine must be a hint. drop its call. */ * then this entire subroutine must be a hint. drop its call. */
if (drop.ends_in_hint) if (drop.ends_in_hint)
{ {
@ -821,6 +823,10 @@ struct subr_subsetter_t
if (!str.at_end (pos)) if (!str.at_end (pos))
drop.ends_in_hint = false; drop.ends_in_hint = false;
} }
else if (drop.all_dropped)
{
str.values[pos].set_drop ();
}
return has_hint; return has_hint;
} }
@ -839,7 +845,6 @@ struct subr_subsetter_t
has_hint = drop_hints_in_subr (str, pos, has_hint = drop_hints_in_subr (str, pos,
*param.parsed_local_subrs, str.values[pos].subr_num, *param.parsed_local_subrs, str.values[pos].subr_num,
param, drop); param, drop);
break; break;
case OpCode_callgsubr: case OpCode_callgsubr:
@ -896,6 +901,23 @@ struct subr_subsetter_t
} }
} }
/* Raise all_dropped flag if all operators except return are dropped from a subr.
* It may happen even after seeing the first moveto if a subr contains
* only (usually one) hintmask operator, then calls to this subr can be dropped.
*/
drop.all_dropped = true;
for (unsigned int pos = 0; pos < str.values.length; pos++)
{
parsed_cs_op_t &csop = str.values[pos];
if (csop.op == OpCode_return)
break;
if (!csop.for_drop ())
{
drop.all_dropped = false;
break;
}
}
return seen_hint; return seen_hint;
} }