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

[cff] Don't remove coords const qualification 

We should find some way to audit all the const removals, perhaps by
enabling -Wold-style-cast warning on the project and turning all the
implicit const removals to const_cast.
This commit is contained in:
Ebrahim Byagowi 2020-02-24 08:23:23 +03:30
parent ff5223ba60
commit 5f23a76e99
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<blend_arg_t, CFF2Subrs>
{ {
template <typename ACC> template <typename ACC>
void init (const byte_str_t &str, ACC &acc, unsigned int fd, void init (const byte_str_t &str, ACC &acc, unsigned int fd,
const int *coords_=nullptr, unsigned int num_coords_=0) const int *coords_=nullptr, unsigned int num_coords_=0)
{ {
SUPER::init (str, acc.globalSubrs, acc.privateDicts[fd].localSubrs); SUPER::init (str, acc.globalSubrs, acc.privateDicts[fd].localSubrs);
@ -134,8 +134,7 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<blend_arg_t, CFF2Subrs>
if (do_blend) if (do_blend)
{ {
scalars.resize (region_count); scalars.resize (region_count);
varStore->varStore.get_scalars (get_ivs (), varStore->varStore.get_scalars (get_ivs (), coords, num_coords,
(int *)coords, num_coords,
&scalars[0], region_count); &scalars[0], region_count);
} }
seen_blend = true; seen_blend = true;

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

@ -2206,7 +2206,7 @@ struct VarData
return delta; return delta;
} }
void get_scalars (int *coords, unsigned int coord_count, void get_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
@ -2423,7 +2423,7 @@ struct VariationStore
{ return (this+dataSets[ivs]).get_region_index_count (); } { return (this+dataSets[ivs]).get_region_index_count (); }
void get_scalars (unsigned int ivs, void get_scalars (unsigned int ivs,
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
{ {