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

Pcbnew: fix potential bug in connections calculations (see Bug #909298 ).

This commit is contained in:
jean-pierre charras 2011-12-28 16:14:46 +01:00
parent 1cb1e88ef4
commit b7db108cd7
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcbnew/class_board.cpp
View File

@ -1583,12 +1583,12 @@ D_PAD* BOARD::GetPad( std::vector<D_PAD*>& aPadList, const wxPoint& aPosition, i
int idxmax = aPadList.size()-1; int idxmax = aPadList.size()-1;
int delta = aPadList.size(); int delta = aPadList.size();
if( delta & 1 && delta > 1 )
delta += 1; int idx = 0; // Starting index is the beginning of list
delta /= 2;
int idx = delta; // Starting index is the middle of list
while( delta ) while( delta )
{ {
// Calculate half size of remaining interval to test.
// Ensure the computed value is not truncated (too small)
if( (delta & 1) && ( delta > 1 ) ) if( (delta & 1) && ( delta > 1 ) )
delta++; delta++;
delta /= 2; delta /= 2;

16
pcbnew/connect.cpp
View File

@ -342,12 +342,12 @@ void CONNECTIONS::CollectItemsNearTo( std::vector<CONNECTED_POINT*>& aList,
int idxmax = m_candidates.size()-1; int idxmax = m_candidates.size()-1;
int delta = m_candidates.size(); int delta = m_candidates.size();
if( delta & 1 && delta > 1 )
delta += 1; int idx = 0; // Starting index is the beginning of list
delta /= 2;
int idx = delta; // Starting index is the middle of list
while( delta ) while( delta )
{ {
// Calculate half size of remaining interval to test.
// Ensure the computed value is not truncated (too small)
if( (delta & 1) && ( delta > 1 ) ) if( (delta & 1) && ( delta > 1 ) )
delta++; delta++;
delta /= 2; delta /= 2;
@ -530,12 +530,12 @@ int CONNECTIONS::searchEntryPointInCandidatesList( const wxPoint & aPoint)
int idxmax = m_candidates.size()-1; int idxmax = m_candidates.size()-1;
int delta = m_candidates.size(); int delta = m_candidates.size();
if( delta & 1 && delta > 1 )
delta += 1; int idx = 0; // Starting index is the beginning of list
delta /= 2;
int idx = delta; // Starting index is the middle of list
while( delta ) while( delta )
{ {
// Calculate half size of remaining interval to test.
// Ensure the computed value is not truncated (too small)
if( (delta & 1) && ( delta > 1 ) ) if( (delta & 1) && ( delta > 1 ) )
delta++; delta++;
delta /= 2; delta /= 2;