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

Use UnsizedArrayOf<> in one place where [VAR] was used 

Trying to see how many can converted meaningfully.
This commit is contained in:
Behdad Esfahbod 2018-05-08 16:42:45 -07:00
parent 0644d92ef3
commit 091c17df5a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hb-ot-layout-common-private.hh
View File

@ -1279,7 +1279,7 @@ struct VarRegionList
if (unlikely (region_index >= regionCount)) if (unlikely (region_index >= regionCount))
return 0.; return 0.;
const VarRegionAxis *axes = axesZ + (region_index * axisCount); const VarRegionAxis *axes = axesZ.arrayZ + (region_index * axisCount);
float v = 1.; float v = 1.;
unsigned int count = axisCount; unsigned int count = axisCount;
@ -1298,14 +1298,14 @@ struct VarRegionList
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (c->check_struct (this) && return_trace (c->check_struct (this) &&
c->check_array (axesZ, axesZ[0].static_size, axesZ.sanitize (c, (unsigned int) axisCount * (unsigned int) regionCount));
(unsigned int) axisCount * (unsigned int) regionCount));
} }
protected: protected:
HBUINT16 axisCount; HBUINT16 axisCount;
HBUINT16 regionCount; HBUINT16 regionCount;
VarRegionAxis axesZ[VAR]; UnsizedArrayOf<VarRegionAxis>
axesZ;
public: public:
DEFINE_SIZE_ARRAY (4, axesZ); DEFINE_SIZE_ARRAY (4, axesZ);
}; };
@ -1364,7 +1364,7 @@ struct VarData
HBUINT16 itemCount; HBUINT16 itemCount;
HBUINT16 shortCount; HBUINT16 shortCount;
ArrayOf<HBUINT16> regionIndices; ArrayOf<HBUINT16> regionIndices;
HBUINT8 bytesX[VAR]; HBUINT8 bytesX[VAR];
public: public:
DEFINE_SIZE_ARRAY2 (6, regionIndices, bytesX); DEFINE_SIZE_ARRAY2 (6, regionIndices, bytesX);
}; };