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

[VarStore] Rename internal get_scalars() to get_region_scalars()

This commit is contained in:
Behdad Esfahbod 2021-07-28 18:02:52 -06:00
parent d7541f7b55
commit ff1fe25a5d
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,8 +136,8 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<blend_arg_t, CFF2Subrs>
if (unlikely (!scalars.resize (region_count))) if (unlikely (!scalars.resize (region_count)))
set_error (); set_error ();
else else
varStore->varStore.get_scalars (get_ivs (), coords, num_coords, varStore->varStore.get_region_scalars (get_ivs (), coords, num_coords,
&scalars[0], region_count); &scalars[0], region_count);
} }
seen_blend = true; seen_blend = true;
} }

25
src/hb-ot-layout-common.hh
View File

@ -2597,10 +2597,10 @@ struct VarData
return delta; return delta;
} }
void get_scalars (const int *coords, unsigned int coord_count, void get_region_scalars (const int *coords, unsigned int coord_count,
const VarRegionList &regions, const VarRegionList &regions,
float *scalars /*OUT */, float *scalars /*OUT */,
unsigned int num_scalars) const unsigned int num_scalars) const
{ {
unsigned count = hb_min (num_scalars, regionIndices.len); unsigned count = hb_min (num_scalars, regionIndices.len);
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
@ -2852,13 +2852,13 @@ struct VariationStore
&& varstore_prime->dataSets); && varstore_prime->dataSets);
} }
unsigned int get_region_index_count (unsigned int ivs) const unsigned int get_region_index_count (unsigned int major) const
{ return (this+dataSets[ivs]).get_region_index_count (); } { return (this+dataSets[major]).get_region_index_count (); }
void get_scalars (unsigned int ivs, void get_region_scalars (unsigned int major,
const int *coords, unsigned int coord_count, const int *coords, unsigned int coord_count,
float *scalars /*OUT*/, float *scalars /*OUT*/,
unsigned int num_scalars) const unsigned int num_scalars) const
{ {
#ifdef HB_NO_VAR #ifdef HB_NO_VAR
for (unsigned i = 0; i < num_scalars; i++) for (unsigned i = 0; i < num_scalars; i++)
@ -2866,8 +2866,9 @@ struct VariationStore
return; return;
#endif #endif
(this+dataSets[ivs]).get_scalars (coords, coord_count, this+regions, (this+dataSets[major]).get_region_scalars (coords, coord_count,
&scalars[0], num_scalars); this+regions,
&scalars[0], num_scalars);
} }
unsigned int get_sub_table_count () const { return dataSets.len; } unsigned int get_sub_table_count () const { return dataSets.len; }