Merge lp:~nicolas-planel/kicad/kicad into lp:kicad/product

[Nicolas PLANEL]

5735: Nicolas PLANEL 2015-06-12 Avoid memleak on ColorMap during normal usage
5734: Nicolas PLANEL 2015-06-11 Add missing CXX check : HAVE_STRCASECMP, HAVE_STRNCASECMP on string.h

[Wayne Stambaugh (stambaughw)]

Looks good. I will commit this patch. Thank you for your contribution to kicad.

review: Approve

[Wayne Stambaugh (stambaughw)]

You merge request was committed in the product branch r5744.

=== modified file 'CMakeModules/PerformFeatureChecks.cmake'
--- CMakeModules/PerformFeatureChecks.cmake	2015-02-19 01:47:34 +0000
+++ CMakeModules/PerformFeatureChecks.cmake	2015-06-12 22:41:08 +0000
@@ -83,6 +83,9 @@
     check_symbol_exists( strncasecmp "strings.h" HAVE_STRNCASECMP )
     check_symbol_exists( strtok_r "string.h" HAVE_STRTOKR )
 
+    check_cxx_symbol_exists( strcasecmp "string.h" HAVE_STRCASECMP )
+    check_cxx_symbol_exists( strncasecmp "string.h" HAVE_STRNCASECMP )
+
     # Some platforms define malloc and free in malloc.h instead of stdlib.h.
     check_symbol_exists( malloc "stdlib.h" MALLOC_IN_STDLIB_H )
 
 
=== modified file 'utils/idftools/CMakeLists.txt'
--- utils/idftools/CMakeLists.txt	2015-03-03 10:50:50 +0000
+++ utils/idftools/CMakeLists.txt	2015-06-12 22:41:08 +0000
@@ -2,6 +2,7 @@
     "${CMAKE_SOURCE_DIR}/lib_dxf"
     "${CMAKE_SOURCE_DIR}/utils/idftools"
     ${OPENGL_INCLUDE_DIR}
+    ${Boost_INCLUDE_DIR}
   )
 
 link_directories(
@@ -17,6 +18,8 @@
 add_executable( dxf2idf dxf2idfmain.cpp dxf2idf.cpp )
 add_executable( idf2vrml idf2vrml.cpp )
 
+add_dependencies( idf2vrml boost )
+
 target_link_libraries( dxf2idf lib_dxf idf3 ${wxWidgets_LIBRARIES} )
 
 target_link_libraries( idf2vrml idf3 ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES} )
 
=== modified file 'utils/idftools/idf2vrml.cpp'
--- utils/idftools/idf2vrml.cpp	2014-06-02 10:46:29 +0000
+++ utils/idftools/idf2vrml.cpp	2015-06-12 22:41:08 +0000
@@ -49,6 +49,7 @@
 #include <algorithm>
 #include <libgen.h>
 #include <unistd.h>
+#include <boost/ptr_container/ptr_map.hpp>
 
 #include <idf_helpers.h>
 #include <idf_common.h>
@@ -63,6 +64,7 @@
 extern int   optopt;
 
 using namespace std;
+using namespace boost;
 
 #define CLEANUP do { \
 setlocale( LC_ALL, "C" ); \
@@ -122,7 +124,7 @@
                      bool top, double top_z, double bottom_z, int precision, bool compact );
 inline void TransformPoint( IDF_SEGMENT& seg, double frac, bool bottom,
                             double dX, double dY, double angle );
-VRML_IDS* GetColor( std::map<std::string, VRML_IDS*>& cmap,
+VRML_IDS* GetColor( boost::ptr_map<const std::string, VRML_IDS>& cmap,
                       int& index, const std::string& uid );
 
 
@@ -743,7 +745,7 @@
     bool   bottom;
     IDF3::IDF_LAYER lyr;
 
-    std::map< std::string, VRML_IDS*> cmap;  // map colors by outline UID
+    boost::ptr_map< const std::string, VRML_IDS> cmap;  // map colors by outline UID
     VRML_IDS* vcp;
     IDF3_COMP_OUTLINE* pout;
 
@@ -861,14 +863,14 @@
 }
 
 
-VRML_IDS* GetColor( std::map<std::string, VRML_IDS*>& cmap, int& index, const std::string& uid )
+VRML_IDS* GetColor( boost::ptr_map<const std::string, VRML_IDS>& cmap, int& index, const std::string& uid )
 {
     static int refnum = 0;
 
     if( index < 2 )
         index = 2;   // 0 and 1 are special (BOARD, UID=NOGEOM_NOPART)
 
-    std::map<std::string, VRML_IDS*>::iterator cit = cmap.find( uid );
+    boost::ptr_map<const std::string, VRML_IDS>::iterator cit = cmap.find( uid );
 
     if( cit == cmap.end() )
     {
@@ -886,7 +888,7 @@
         if( showObjectMapping )
             cout << "* " << ostr.str() << " = '" << uid << "'\n";
 
-        cmap.insert( std::pair<std::string, VRML_IDS*>(uid, id) );
+        cmap.insert( uid, id );
 
         if( index >= NCOLORS )
             index = 2;
@@ -922,7 +924,7 @@
     bool   bottom;
     int nvcont;
 
-    std::map< std::string, VRML_IDS*> cmap;  // map colors by outline UID
+    boost::ptr_map< const std::string, VRML_IDS> cmap;  // map colors by outline UID
     VRML_IDS* vcp;
     OTHER_OUTLINE* pout;