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

eeschema: fix memory leakage. 

Pcbnew: fix a minor issue.
Version update.
parent f53e8971

common/CMakeLists.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,6 @@ set(COMMON_SRCS 
    msgpanel.cpp

    msgpanel.cpp

    netlist_keywords.cpp

    netlist_keywords.cpp

    newstroke_font.cpp

    newstroke_font.cpp

    ../pcbnew/class_drc_item.cpp

    projet_config.cpp

    projet_config.cpp

    richio.cpp

    richio.cpp

    selcolor.cpp

    selcolor.cpp

common/build_version.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
#endif

#endif





#ifndef KICAD_BUILD_VERSION

#ifndef KICAD_BUILD_VERSION

#define KICAD_BUILD_VERSION "(2011-05-31)"

#define KICAD_BUILD_VERSION "(2011-06-08)"

#endif

#endif

demos/pic_programmer/pic_programmer.pro

+77 −79
Original line number Original line Diff line number Diff line 
update=18/4/2006-09:31:05

update=09/06/2011 08:34:19

last_client=pcbnew

last_client=cvpcb

[general]

[general]

version=1

version=1

RootSch=pic_programmer.sch

RootSch=pic_programmer.sch

BoardNm=pic_programmer.brd

BoardNm=pic_programmer.brd

[cvpcb]

version=1

NetITyp=0

NetIExt=.net

PkgIExt=.pkg

NetType=0

[cvpcb/libraries]

EquName1=devcms

[common]

[common]

NetDir=

NetDir=

[pcbnew]

[pcbnew]
@@ -69,11 +61,17 @@ MaxLnkS=3 
ShowRat=0

ShowRat=0

ShowMRa=1

ShowMRa=1

[pcbnew/libraries]

[pcbnew/libraries]

LibName1=dip_sockets

LibName2=sockets

LibName3=connect

LibName4=discret

LibName5=pin_array

LibName6=divers

LibName7=libcms

LibName8=display

LibDir=

LibDir=

LibName1=supports

[cvpcb]

LibName2=connect

version=1

LibName3=discret

NetIExt=net

LibName4=pin_array

[cvpcb/libraries]

LibName5=divers

EquName1=devcms
 
LibName6=libcms

LibName7=display

eeschema/sch_sheet_pin.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -304,7 +304,7 @@ bool SCH_SHEET_PIN::Load( LINE_READER& aLine, wxString& aErrorMsg ) 
    static const char delims[] = " \t";

    static const char delims[] = " \t";





    // Read coordinates.

    // Read coordinates.

    D( printf( "line: \"%s\"\n", line );)

    // D( printf( "line: \"%s\"\n", line );)





    cp = strtok( line, delims );

    cp = strtok( line, delims );

eeschema/schframe.cpp

+7 −4
Original line number Original line Diff line number Diff line
@@ -352,12 +352,12 @@ void SCH_EDIT_FRAME::CreateScreens() 




void SCH_EDIT_FRAME::SetUndoItem( const SCH_ITEM* aItem )

void SCH_EDIT_FRAME::SetUndoItem( const SCH_ITEM* aItem )

{

{

    if( (aItem != NULL) && (m_undoItem != NULL) )

    if( m_undoItem != NULL )

    {

    {

        delete m_undoItem;

        delete m_undoItem;

        m_undoItem = NULL;

    }

    }





    m_undoItem = NULL;





    if( aItem )

    if( aItem )

        m_undoItem = aItem->Clone();

        m_undoItem = aItem->Clone();
@@ -366,13 +366,16 @@ void SCH_EDIT_FRAME::SetUndoItem( const SCH_ITEM* aItem ) 




void SCH_EDIT_FRAME::SaveUndoItemInUndoList( SCH_ITEM* aItem )

void SCH_EDIT_FRAME::SaveUndoItemInUndoList( SCH_ITEM* aItem )

{

{

    wxCHECK_RET( aItem != NULL && m_undoItem != NULL && (aItem->Type() == m_undoItem->Type() ),

    wxCHECK_RET( aItem != NULL,

                 wxT( "Cannot swap undo item structures.  Bad programmer!." ) );

    wxCHECK_RET( m_undoItem != NULL,

                 wxT( "Cannot swap undo item structures.  Bad programmer!." ) );

    wxCHECK_RET( aItem->Type() == m_undoItem->Type(),

                 wxT( "Cannot swap undo item structures.  Bad programmer!." ) );

                 wxT( "Cannot swap undo item structures.  Bad programmer!." ) );





    aItem->SwapData( m_undoItem );

    aItem->SwapData( m_undoItem );

    SaveCopyInUndoList( aItem, UR_CHANGED );

    SaveCopyInUndoList( aItem, UR_CHANGED );

    aItem->SwapData( m_undoItem );

    aItem->SwapData( m_undoItem );

    m_undoItem = NULL;

}

}