haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small performance improvement loading stroke font.

This commit is contained in:
Jeff Young 2018-08-05 01:05:58 +01:00
parent 3bf2e2f9fc
commit 146ab1eb32
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/gal/stroke_font.cpp
View File

@ -55,12 +55,12 @@ bool STROKE_FONT::LoadNewStrokeFont( const char* const aNewStrokeFont[], int aNe
for( int j = 0; j < aNewStrokeFontSize; j++ ) for( int j = 0; j < aNewStrokeFontSize; j++ )
{ {
GLYPH glyph; GLYPH& glyph = m_glyphs[j];
double glyphStartX = 0.0; double glyphStartX = 0.0;
double glyphEndX = 0.0; double glyphEndX = 0.0;
VECTOR2D glyphBoundingX; VECTOR2D glyphBoundingX;
std::deque<VECTOR2D> pointList; std::deque<VECTOR2D>* pointList = nullptr;
int i = 0; int i = 0;
@ -84,10 +84,7 @@ bool STROKE_FONT::LoadNewStrokeFont( const char* const aNewStrokeFont[], int aNe
else if( ( coordinate[0] == ' ' ) && ( coordinate[1] == 'R' ) ) else if( ( coordinate[0] == ' ' ) && ( coordinate[1] == 'R' ) )
{ {
// Raise pen // Raise pen
if( pointList.size() > 0 ) pointList = nullptr;
glyph.push_back( pointList );
pointList.clear();
} }
else else
{ {
@ -105,17 +102,19 @@ bool STROKE_FONT::LoadNewStrokeFont( const char* const aNewStrokeFont[], int aNe
// was built. It allows shapes coordinates like W M ... to be >= 0 // was built. It allows shapes coordinates like W M ... to be >= 0
// Only shapes like j y have coordinates < 0 // Only shapes like j y have coordinates < 0
point.y = (double) ( coordinate[1] - 'R' + FONT_OFFSET ) * STROKE_FONT_SCALE; point.y = (double) ( coordinate[1] - 'R' + FONT_OFFSET ) * STROKE_FONT_SCALE;
pointList.push_back( point );
if( !pointList )
{
glyph.emplace_back( std::deque<VECTOR2D>() );
pointList = &glyph.back();
}
pointList->push_back( point );
} }
i += 2; i += 2;
} }
if( pointList.size() > 0 )
glyph.push_back( pointList );
m_glyphs[j] = glyph;
// Compute the bounding box of the glyph // Compute the bounding box of the glyph
m_glyphBoundingBoxes[j] = computeBoundingBox( glyph, glyphBoundingX ); m_glyphBoundingBoxes[j] = computeBoundingBox( glyph, glyphBoundingX );
} }