Commit 2be09ba9 authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Fix bug when footprint library file names contain dots. (fixes lp:593989)

parent 84305082

common/footprint_info.cpp

+27 −4
Original line number Original line Diff line number Diff line 
/*

 * This program source code file is part of KiCad, a free EDA CAD application.

 *

 * Copyright (C) 2011 Jean-Pierre Charras, <jp.charras@wanadoo.fr>

 * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version 2

 * of the License, or (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, you may find one here:

 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html

 * or you may search the http://www.gnu.org website for the version 2 license,

 * or you may write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

 */



/**

/**

 * @file footprint_info.cpp

 * @file footprint_info.cpp

 */

 */
@@ -52,9 +76,8 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( wxArrayString& aFootprintsLibNames ) 
        // Parse Libraries Listed

        // Parse Libraries Listed

        for( unsigned ii = 0; ii < aFootprintsLibNames.GetCount(); ii++ )

        for( unsigned ii = 0; ii < aFootprintsLibNames.GetCount(); ii++ )

        {

        {

            wxFileName filename = aFootprintsLibNames[ii];

            wxFileName filename( wxEmptyString, aFootprintsLibNames[ii],



                                 LegacyFootprintLibPathExtension );

            filename.SetExt( LegacyFootprintLibPathExtension );





            wxString libPath = wxGetApp().FindLibraryPath( filename );

            wxString libPath = wxGetApp().FindLibraryPath( filename );

cvpcb/class_DisplayFootprintsFrame.cpp

+2 −3
Original line number Original line Diff line number Diff line
@@ -481,9 +481,8 @@ MODULE* DISPLAY_FOOTPRINTS_FRAME::Get_Module( const wxString& aFootprintName ) 




        for( unsigned i = 0; i < parent->m_ModuleLibNames.GetCount();  ++i )

        for( unsigned i = 0; i < parent->m_ModuleLibNames.GetCount();  ++i )

        {

        {

            wxFileName fn = parent->m_ModuleLibNames[i];

            wxFileName fn( wxEmptyString, parent->m_ModuleLibNames[i],



                           LegacyFootprintLibPathExtension );

            fn.SetExt( LegacyFootprintLibPathExtension );





            wxString libPath = wxGetApp().FindLibraryPath( fn );

            wxString libPath = wxGetApp().FindLibraryPath( fn );