Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing STB image symbol duplicates #1715

Merged
merged 3 commits into from
Jan 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/DGtal/io/readers/STBReader.ih
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/DGtal/io/writers/STBWriter.ih
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/DGtal/math/linalg/EigenDecomposition.ih
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] );
Expand Down
Loading