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

pcbnew: Fix Eagle UTF8 import error 

Implicit convertion from wxString to std::string will use narrow strings
and drop UTF-8.

Fixes: lp:1789311
* https://bugs.launchpad.net/kicad/+bug/1789311
This commit is contained in:
Seth Hillbrand 2018-08-30 13:05:54 -07:00
parent 25b6604fc5
commit f84bd0d836
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcbnew/eagle_plugin.cpp
View File

@ -816,13 +816,16 @@ void EAGLE_PLUGIN::loadLibrary( wxXmlNode* aLib, const wxString* aLibName )
{
m_xpath->push( "package", "name" );
const wxString& pack_ref = package->GetAttribute( "name" );
std::string pack_name( pack_ref );
ReplaceIllegalFileNameChars( &pack_name, '_' );
wxString pack_ref = package->GetAttribute( "name" );
ReplaceIllegalFileNameChars( pack_ref, '_' );
std::string pack_name = Convert<std::string>( pack_ref );
if(pack_name.length() == 0 )
printf("Empty!\n");
m_xpath->Value( pack_name.c_str() );
wxString key = aLibName ? makeKey( *aLibName, pack_name ) : wxString( pack_name );
wxString key = aLibName ? makeKey( *aLibName, pack_ref ) : pack_ref;
MODULE* m = makeModule( package, pack_name );
@ -837,8 +840,9 @@ void EAGLE_PLUGIN::loadLibrary( wxXmlNode* aLib, const wxString* aLibName )
wxString pkg = FROM_UTF8( pack_name.c_str() );
wxString emsg = wxString::Format(
_( "<package> name: \"%s\" duplicated in eagle <library>: \"%s\"" ),
_( "<package> name: \"%s\" : %s duplicated in eagle <library>: \"%s\"" ),
GetChars( pkg ),
GetChars( key ),
GetChars( lib )
);
THROW_IO_ERROR( emsg );