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

fix ownership issue in wxFFile vs. FILE_LINE_READER

This commit is contained in:
Dick Hollenbeck 2012-10-24 13:42:39 -05:00
parent 5634bc3381
commit 28222961dd
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcbnew/kicad_plugin.cpp
View File

@ -983,7 +983,7 @@ void PCB_IO::format( MODULE* aModule, int aNestLevel ) const
void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
throw( IO_ERROR )
{
std::string shape;
const char* shape;
switch( aPad->GetShape() )
{
@ -996,7 +996,7 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
THROW_IO_ERROR( wxString::Format( _( "unknown pad type: %d"), aPad->GetShape() ) );
}
std::string type;
const char* type;
switch( aPad->GetAttribute() )
{
@ -1012,7 +1012,7 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
m_out->Print( aNestLevel, "(pad %s %s %s",
m_out->Quotew( aPad->GetPadName() ).c_str(),
type.c_str(), shape.c_str() );
type, shape );
m_out->Print( 0, " (at %s", FMT_IU( aPad->GetPos0() ).c_str() );
if( aPad->GetOrientation() != 0.0 )
@ -1502,7 +1502,7 @@ BOARD* PCB_IO::Load( const wxString& aFileName, BOARD* aAppendToMe, PROPERTIES*
THROW_IO_ERROR( msg );
}
FILE_LINE_READER reader( file.fp(), aFileName );
FILE_LINE_READER reader( file.fp(), aFileName, false /* wxFFile owns fp */ );
m_parser->SetLineReader( &reader );
m_parser->SetBoard( aAppendToMe );