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

fixed ends_in_hint bug 

subr ends in hint itself should be regarded as hint
this flag should propagate to its caller if the call itself is at the end of the caller
This commit is contained in:
Michiharu Ariza 2018-11-07 17:58:45 -08:00
parent 4d74020694
commit 636a6833c5
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -442,6 +442,12 @@ struct ParsedCStr : ParsedValues<ParsedCSOp>
prefix_num_ = num; prefix_num_ = num;
} }
inline bool at_end (unsigned int pos) const
{
return ((pos + 1 >= values.len) /* CFF2 */
|| (values[pos + 1].op == OpCode_return));
}
inline bool is_parsed (void) const { return parsed; } inline bool is_parsed (void) const { return parsed; }
inline void set_parsed (void) { parsed = true; } inline void set_parsed (void) { parsed = true; }
inline bool is_hint_dropped (void) const { return hint_dropped; } inline bool is_hint_dropped (void) const { return hint_dropped; }
@ -792,7 +798,13 @@ struct SubrSubsetter
/* 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 a 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)
{
str.values[pos].set_drop (); str.values[pos].set_drop ();
/* if this subr call is at the end of the parent subr, propagate the flag
* otherwise reset the flag */
if (!str.at_end (pos))
drop.ends_in_hint = false;
}
return has_hint; return has_hint;
} }
@ -841,8 +853,7 @@ struct SubrSubsetter
case OpCode_vstem: case OpCode_vstem:
has_hint = true; has_hint = true;
str.values[pos].set_drop (); str.values[pos].set_drop ();
if ((pos + 1 >= str.values.len) /* CFF2 */ if (str.at_end (pos))
|| (str.values[pos + 1].op == OpCode_return))
drop.ends_in_hint = true; drop.ends_in_hint = true;
break; break;