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

Polyline.cpp: fix a bad wxASSERT test which generate error messages in Debug mode when there is no error, in DEBUG mode, when filling zones with holes.

This commit is contained in:
jean-pierre charras 2012-11-27 21:12:39 +01:00
parent 5155c35a71
commit efdf28f67e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/build_BOM.cpp
View File

@ -245,7 +245,7 @@ order = Alphab. ) count = %d\n\n"
labeltype = wxT( "Global " ); labeltype = wxT( "Global " );
sheetpath = m_labelList[ii].GetSheetPath().PathHumanReadable(); sheetpath = m_labelList[ii].GetSheetPath().PathHumanReadable();
msg.Printf( _( "> %-28.28s %s %s\n" ), msg.Printf( wxT( "> %-28.28s %s %s\n" ),
GetChars( label->GetText() ), GetChars( label->GetText() ),
GetChars( labeltype ), GetChars( labeltype ),
GetChars( returnURLItemLocation( sheetpath, label->m_Pos ) ) ); GetChars( returnURLItemLocation( sheetpath, label->m_Pos ) ) );

6
polygon/PolyLine.cpp
View File

@ -1321,12 +1321,12 @@ void ConvertPolysListWithHolesToOnePolygon( const std::vector<CPolyPt>& aPolysL
polysholes.push_back( poly_tmp ); polysholes.push_back( poly_tmp );
} }
} }
mainpoly -= polysholes; mainpoly -= polysholes;
// copy polygon with no holes to destination // copy polygon with no holes to destination
// We should have only one polygon in list // Because all holes are now linked to the main outline
wxASSERT( mainpoly.size() != 1 ); // by overlapping segments, we should have only one polygon in list
wxASSERT( mainpoly.size() == 1 );
KI_POLYGON& poly_nohole = mainpoly[0]; KI_POLYGON& poly_nohole = mainpoly[0];
CPolyPt corner( 0, 0, false ); CPolyPt corner( 0, 0, false );