bool ShapeInfoTest( const ShapeInfoData& data )
{
// 1) Create the model.
- LogicalModelPtr logicalModel;
- VisualModelPtr visualModel;
+ ModelPtr textModel;
MetricsPtr metrics;
Size textArea(100.f, 60.f);
Size layoutSize;
data.fontDescriptions,
options,
layoutSize,
- logicalModel,
- visualModel,
+ textModel,
metrics,
false );
+ LogicalModelPtr logicalModel = textModel->mLogicalModel;
+ VisualModelPtr visualModel = textModel->mVisualModel;
+
// 2) Clear the model.
Vector<GlyphInfo>& glyphs = visualModel->mGlyphs;
struct GlyphInfoData glyphs01[] =
{
{ 2u, 21154u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, true },
- { 2u, 12298, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, true },
+ { 2u, 12298u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, true },
{ 2u, 17828u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, true },
};
struct GlyphInfoData glyphs02[] =
{
{ 2u, 21154u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, false, false },
- { 2u, 12298, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, false, true },
+ { 2u, 12298u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, false, true },
{ 2u, 17828u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, false },
};