Merge pull request #1715 from DGtal-team/stbSymbols

Fixing STB image symbol duplicates

ChangeLog.md

@@ -24,6 +24,9 @@
     camera or the scene) (Bertrand Kerautret, [#1683](https://github.com/DGtal-team/DGtal/pull/1683))
   - Add a new method to store material information in obj file in MeshReader and MeshWriter.
     (Bertrand Kerautret, [#1686](https://github.com/DGtal-team/DGtal/pull/1686))
+  - Fix duplicate symbols on Windows due to stb_image, see issue #1714 (David Coeurjolly,
+    [#1715](https://github.com/DGtal-team/DGtal/pull/1715)
+
 
 - *Shapes*
   - Add flips to SurfaceMesh data structure

src/DGtal/io/readers/STBReader.ih

@@ -28,6 +28,7 @@
 
 #ifndef NO_ADD_STBIMAGE_IMPLEMENT //To avoid duplicated linking errors (like LNK2005 in MSVC)
 #pragma once
+#define STB_IMAGE_STATIC  //issue #1714
 #define STB_IMAGE_IMPLEMENTATION
 #endif //NO_ADD_STBIMAGE_IMPLEMENT
 #pragma GCC diagnostic push

src/DGtal/io/writers/STBWriter.ih

@@ -28,6 +28,7 @@
 
 #ifndef NO_ADD_STBIMAGE_IMPLEMENT //To avoid duplicated linking errors (like LNK2005 in MSVC)
 #pragma once
+#define STB_IMAGE_WRITE_STATIC  //issue #1714
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #endif //NO_ADD_STBIMAGE_IMPLEMENT
 #pragma GCC diagnostic push

src/DGtal/math/linalg/EigenDecomposition.ih

@@ -215,10 +215,8 @@ decomposeQL( Matrix& V, Vector& d, Vector e )
       // otherwise, iterate.
       if( m > l )
         {
-          int iter = 0;
           do
             {
-              ++iter;  // (Could check iteration count here.)
               // Compute implicit shift
               Quantity g = d[ l ];
               Quantity p = ( d[ l + 1 ] - g ) / ( Quantity( 2.0 ) * e[ l ] );