提交 091c17df 编写于 作者: B Behdad Esfahbod

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

Trying to see how many can converted meaningfully.
上级 0644d92e
...@@ -1279,7 +1279,7 @@ struct VarRegionList ...@@ -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 ...@@ -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 ...@@ -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);
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册