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

Very minor fixes.

parent 4ff3a78d

pcbnew/autorouter/automove.cpp

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ void PCB_EDIT_FRAME::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb ) 
        GetScreen()->SetCrossHairPosition( current + Module->m_Pos -

                                           Module->m_BoundaryBox.GetPosition() );



        Ymax_size = max( Ymax_size, Module->m_BoundaryBox.GetHeight() );

        Ymax_size = std::max( Ymax_size, Module->m_BoundaryBox.GetHeight() );



        PlaceModule( Module, NULL, true );

pcbnew/board_items_to_polygon_shape_transform.cpp

+2 −2
Original line number Diff line number Diff line
@@ -661,8 +661,8 @@ void CreateThermalReliefPadPolygon( std::vector<CPolyPt>& aCornerBuffer, 
    if( aCopperThickness < 0 )

        aCopperThickness = 0;



    copper_thickness.x = min( dx, aCopperThickness );

    copper_thickness.y = min( dy, aCopperThickness );

    copper_thickness.x = std::min( dx, aCopperThickness );

    copper_thickness.y = std::min( dy, aCopperThickness );



    switch( aPad.GetShape() )

    {

pcbnew/class_board_connected_item.cpp

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ int BOARD_CONNECTED_ITEM::GetClearance( BOARD_CONNECTED_ITEM* aItem ) const 
        if( aItem )

        {

            int hisClearance = aItem->GetClearance();

            return max( hisClearance, myClearance );

            return std::max( hisClearance, myClearance );

        }



        return myClearance;

pcbnew/class_pad.cpp

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ int D_PAD::GetClearance( BOARD_CONNECTED_ITEM* aItem ) const 
    if( aItem )

    {

        int hisClearance = aItem->GetClearance();

        return max( hisClearance, clearance );

        return std::max( hisClearance, clearance );

    }



    // Return the specific clearance.

pcbnew/class_pad_draw_functions.cpp

+3 −3
Original line number Diff line number Diff line
@@ -618,9 +618,9 @@ void D_PAD::DrawShape( EDA_RECT* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo ) 
    {

        ReturnStringPadName( buffer );

        int numpad_len = buffer.Len();

        numpad_len = MAX( numpad_len, MIN_CHAR_COUNT );

        numpad_len = std::max( numpad_len, MIN_CHAR_COUNT );



        tsize = min( AreaSize.y, AreaSize.x / numpad_len );

        tsize = std::min( AreaSize.y, AreaSize.x / numpad_len );

        #define CHAR_SIZE_MIN 5



        if( aDC->LogicalToDeviceXRel( tsize ) >= CHAR_SIZE_MIN ) // Not drawable when size too small.
@@ -638,7 +638,7 @@ void D_PAD::DrawShape( EDA_RECT* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo ) 
        return;



    shortname_len = MAX( shortname_len, MIN_CHAR_COUNT );

    tsize = min( AreaSize.y, AreaSize.x / shortname_len );

    tsize = std::min( AreaSize.y, AreaSize.x / shortname_len );



    if( aDC->LogicalToDeviceXRel( tsize ) >= CHAR_SIZE_MIN )  // Not drawable in size too small.

    {