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

fixed test-subset-cff2

This commit is contained in:
Michiharu Ariza 2018-10-08 15:38:05 -07:00
parent a90fd8b9fe
commit df964a0931
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hb-cff2-interp-cs.hh
View File

@ -79,14 +79,13 @@ struct CFF2CSInterpEnv : CSInterpEnv<BlendArg, CFF2Subrs>
{ {
template <typename ACC> template <typename ACC>
inline void init (const ByteStr &str, ACC &acc, unsigned int fd, inline void init (const ByteStr &str, ACC &acc, unsigned int fd,
const int *coords_=nullptr, unsigned int coords_count_=0, const int *coords_=nullptr, unsigned int num_coords_=0)
const CFF2VariationStore *varStore_=nullptr)
{ {
SUPER::init (str, *acc.globalSubrs, *acc.privateDicts[fd].localSubrs); SUPER::init (str, *acc.globalSubrs, *acc.privateDicts[fd].localSubrs);
coords = coords_; coords = coords_;
num_coords = coords_count_; num_coords = num_coords_;
varStore = varStore_; varStore = acc.varStore;
seen_blend = false; seen_blend = false;
seen_vsindex = false; seen_vsindex = false;
scalars.init (); scalars.init ();

2
src/hb-ot-cff2-table.cc
View File

@ -105,7 +105,7 @@ bool OT::cff2::accelerator_t::get_extents (hb_codepoint_t glyph,
unsigned int fd = fdSelect->get_fd (glyph); unsigned int fd = fdSelect->get_fd (glyph);
CFF2CSInterpreter<CFF2CSOpSet_Extents, ExtentsParam> interp; CFF2CSInterpreter<CFF2CSOpSet_Extents, ExtentsParam> interp;
const ByteStr str = (*charStrings)[glyph]; const ByteStr str = (*charStrings)[glyph];
interp.env.init (str, *this, fd, coords, num_coords, varStore); interp.env.init (str, *this, fd, coords, num_coords);
ExtentsParam param; ExtentsParam param;
param.init (); param.init ();
if (unlikely (!interp.interpret (param))) return false; if (unlikely (!interp.interpret (param))) return false;