Skip to content

Commit

Permalink
Merge pull request #79 from kerautret/RemPreProcStbImage
Browse files Browse the repository at this point in the history
Remove preprocessor fix stbImage MSVC link error
  • Loading branch information
dcoeurjo committed Feb 2, 2024
2 parents 28d4d95 + 1d09b77 commit 661d89e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions ChangeLog.md
@@ -1,4 +1,11 @@
# DGtalTools-contrib 1.4 (beta)
- *build*
- Remove STBimage preprocessor instruction used to fix MVSC that is
no more usefull since DGtal PR [175](https://github.com/DGtal-team/DGtal/pull/1715)
(Bertrand Kerautret [#79](https://github.com/DGtal-team/DGtalTools-contrib/pull/79))



- *global*
- Continuous integration on windows does not use Appveyopr anymore but Github Actions.
(Bertrand Kerautret [#77](https://github.com/DGtal-team/DGtalTools-contrib/pull/77))
Expand Down
2 changes: 1 addition & 1 deletion visualisation/polyMeshEdit.cpp
Expand Up @@ -28,7 +28,7 @@
*/

///////////////////////////////////////////////////////////////////////////////
#define NO_ADD_STBIMAGE_IMPLEMENT //To avoid duplicated linking errors (like LNK2005 in MSVC)

#include <iostream>
#include <DGtal/base/Common.h>
#include <DGtal/helpers/StdDefs.h>
Expand Down

0 comments on commit 661d89e

Please sign in to comment.