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

Eeschema: Fix incorrect parsing of old schematic files (version 2) for HLabels and GLabels

This commit is contained in:
jean-pierre charras 2018-09-03 19:51:17 +02:00
parent 9eec296b0a
commit b7b125d83c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eeschema/sch_legacy_plugin.cpp
View File

@ -1363,13 +1363,17 @@ SCH_TEXT* SCH_LEGACY_PLUGIN::loadText( FILE_LINE_READER& aReader )
int thickness = 0; int thickness = 0;
// The following tokens do not exist in version 1 schematic files. // The following tokens do not exist in version 1 schematic files,
// and not always in version 2 for HLabels and GLabels
if( m_version > 1 ) if( m_version > 1 )
{ {
if( strCompare( "Italic", line, &line ) ) if( m_version > 2 || *line >= ' ' )
text->SetItalic( true ); {
else if( !strCompare( "~", line, &line ) ) if( strCompare( "Italic", line, &line ) )
SCH_PARSE_ERROR( _( "expected 'Italics' or '~'" ), aReader, line ); text->SetItalic( true );
else if( !strCompare( "~", line, &line ) )
SCH_PARSE_ERROR( _( "expected 'Italics' or '~'" ), aReader, line );
}
// The thickness token does not exist in older versions of the schematic file format // The thickness token does not exist in older versions of the schematic file format
// so calling parseInt will be made only if the EOL is not reached. // so calling parseInt will be made only if the EOL is not reached.