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

GAL: Use vector for stroke elements 

deque structures have higher overhead than vectors.  Not usually
problematic, but with hundreds of thousands of characters each with only
a few strokes, the overhead becomes dominant.

(cherry picked from commit 6084614371)
This commit is contained in:
Seth Hillbrand 2019-10-18 21:48:58 -07:00 committed by Seth Hillbrand
parent 1161562bc8
commit 50723d07a6
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/gal/stroke_font.cpp
View File

@ -60,7 +60,7 @@ bool STROKE_FONT::LoadNewStrokeFont( const char* const aNewStrokeFont[], int aNe
double glyphEndX = 0.0; double glyphEndX = 0.0;
VECTOR2D glyphBoundingX; VECTOR2D glyphBoundingX;
std::deque<VECTOR2D>* pointList = nullptr; std::vector<VECTOR2D>* pointList = nullptr;
int i = 0; int i = 0;
@ -105,7 +105,7 @@ bool STROKE_FONT::LoadNewStrokeFont( const char* const aNewStrokeFont[], int aNe
if( !pointList ) if( !pointList )
{ {
glyph.emplace_back( std::deque<VECTOR2D>() ); glyph.emplace_back( std::vector<VECTOR2D>() );
pointList = &glyph.back(); pointList = &glyph.back();
} }
@ -140,17 +140,16 @@ BOX2D STROKE_FONT::computeBoundingBox( const GLYPH& aGLYPH, const VECTOR2D& aGLY
{ {
BOX2D boundingBox; BOX2D boundingBox;
std::deque<VECTOR2D> boundingPoints; std::vector<VECTOR2D> boundingPoints;
boundingPoints.emplace_back( VECTOR2D( aGLYPHBoundingX.x, 0 ) ); boundingPoints.emplace_back( VECTOR2D( aGLYPHBoundingX.x, 0 ) );
boundingPoints.emplace_back( VECTOR2D( aGLYPHBoundingX.y, 0 ) ); boundingPoints.emplace_back( VECTOR2D( aGLYPHBoundingX.y, 0 ) );
for( GLYPH::const_iterator pointListIt = aGLYPH.begin(); pointListIt != aGLYPH.end(); ++pointListIt ) for( const auto& pointList : aGLYPH )
{ {
for( std::deque<VECTOR2D>::const_iterator pointIt = pointListIt->begin(); for( const auto& pt : pointList )
pointIt != pointListIt->end(); ++pointIt )
{ {
boundingPoints.emplace_back( VECTOR2D( aGLYPHBoundingX.x, pointIt->y ) ); boundingPoints.emplace_back( aGLYPHBoundingX.x, pt.y );
} }
} }
@ -341,15 +340,13 @@ void STROKE_FONT::drawSingleLineText( const UTF8& aText )
last_had_overbar = false; last_had_overbar = false;
} }
for( GLYPH::iterator pointListIt = glyph.begin(); pointListIt != glyph.end(); for( const auto& pointList : glyph )
++pointListIt )
{ {
std::deque<VECTOR2D> pointListScaled; std::deque<VECTOR2D> pointListScaled;
for( std::deque<VECTOR2D>::iterator pointIt = pointListIt->begin(); for( const auto& pt : pointList )
pointIt != pointListIt->end(); ++pointIt )
{ {
VECTOR2D pointPos( pointIt->x * glyphSize.x + xOffset, pointIt->y * glyphSize.y ); VECTOR2D pointPos( pt.x * glyphSize.x + xOffset, pt.y * glyphSize.y );
if( m_gal->IsFontItalic() ) if( m_gal->IsFontItalic() )
{ {

2
include/gal/stroke_font.h
View File

@ -42,7 +42,7 @@ namespace KIGFX
{ {
class GAL; class GAL;
typedef std::deque< std::deque<VECTOR2D> > GLYPH; typedef std::vector<std::vector<VECTOR2D>> GLYPH;
typedef std::vector<GLYPH> GLYPH_LIST; typedef std::vector<GLYPH> GLYPH_LIST;
/** /**