Commit efdf28f6 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Polyline.cpp: fix a bad wxASSERT test which generate error messages in Debug... 

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.
parent 5155c35a

eeschema/build_BOM.cpp

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ order = Alphab. ) count = %d\n\n" 
                labeltype = wxT( "Global      " );



            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( labeltype ),

                        GetChars( returnURLItemLocation( sheetpath, label->m_Pos ) ) );

polygon/PolyLine.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1321,12 +1321,12 @@ void ConvertPolysListWithHolesToOnePolygon( const std::vector<CPolyPt>& aPolysL 
            polysholes.push_back( poly_tmp );

        }

    }



    mainpoly -= polysholes;



    // copy polygon with no holes to destination

    // We should have only one polygon in list

    wxASSERT( mainpoly.size() != 1 );

    // Because all holes are now linked to the main outline

    // by overlapping segments, we should have only one polygon in list

    wxASSERT( mainpoly.size() == 1 );



    KI_POLYGON& poly_nohole = mainpoly[0];

    CPolyPt   corner( 0, 0, false );