Eeschema: minor improvements to SCH_LINE::MergeOverlap() function.

* Do not statically initialize candidates vector.
* Preset candidates vector allocation size since it is always the same.
This commit is contained in:
Simon Richter 2016-06-27 14:17:39 -04:00 committed by Wayne Stambaugh
parent 236f5369ef
commit 4bf72be9e4
1 changed files with 3 additions and 3 deletions

View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2015 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com * Copyright (C) 2015 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -346,8 +346,8 @@ bool SCH_LINE::MergeOverlap( SCH_LINE* aLine )
// for horizontal segments the uppermost and the lowest point // for horizontal segments the uppermost and the lowest point
if( colinear ) if( colinear )
{ {
static std::vector <wxPoint*> candidates; std::vector <wxPoint*> candidates;
candidates.clear(); candidates.reserve( 4 );
candidates.push_back( &m_start ); candidates.push_back( &m_start );
candidates.push_back( &m_end ); candidates.push_back( &m_end );
candidates.push_back( &aLine->m_start ); candidates.push_back( &aLine->m_start );